From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Jul 2008 07:08:02 +0000 (-0700)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.6.0-rc0~61
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=547905f8cd2a04b3e1117f00025b60f81aa60f47;p=git.git

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
---

547905f8cd2a04b3e1117f00025b60f81aa60f47