From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2013 03:06:55 +0000 (-0700)
Subject: Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
X-Git-Tag: v1.8.4-rc0~165
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c?hp=fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c

Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui

git-gui 0.18.0

* tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui:
git-gui 0.18
git-gui: avoid an error message when removing the last remote
git-gui: fix file name handling with non-empty prefix
git-gui: bring wish process to front on Mac
git-gui: change dialog button positions for Windows to suit platform.
git-gui: allow "\ No newline at end of file" for linewise staging
git-gui: fix the mergetool launcher for the Beyond Compare tool.
Makefile: replace "echo 1>..." with "echo >..."
French translation: copy -> copie.
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
---