commit | 547905f8cd2a04b3e1117f00025b60f81aa60f47 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Jul 15 00:08:02 2008 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Jul 15 00:08:02 2008 -0700 |
tree | 9e9421e597a9caecc6f16c3afd6a1b77abacabb9 | |
parent | ebcffb1d44643bab69671abdf79209489e64dbef [diff] | |
parent | f049e0944d32715ee8893d290d1c52888216fbe4 [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