projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebcffb1 f049e09)
Merge git://repo.or.cz/git-gui
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)
* git://repo.or.cz/git-gui:
  git-gui: MERGE_RR lives in .git/ directly with newer Git versions
  git-gui: Exit shortcut in MacOSX repaired

1  2 
git-gui/git-gui.sh patch | diff1 | diff2 | blob | history
git-gui/lib/merge.tcl patch | diff1 | diff2 | blob | history

diff --cc git-gui/git-gui.sh
Simple merge
diff --cc git-gui/lib/merge.tcl
Simple merge
Git—the stupid content tracker