![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700) | ||
| commit | 547905f8cd2a04b3e1117f00025b60f81aa60f47 | |
| tree | 9e9421e597a9caecc6f16c3afd6a1b77abacabb9 | tree | snapshot |
| parent | ebcffb1d44643bab69671abdf79209489e64dbef | commit | diff |
| parent | f049e0944d32715ee8893d290d1c52888216fbe4 | commit | diff |
Merge git://repo.or.cz/git-gui
* 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
* 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
| git-gui/git-gui.sh | diff1 | | | | blob | history |
| git-gui/lib/merge.tcl | diff1 | | | | blob | history |