Johannes Schindelin f049e0944d git-gui: MERGE_RR lives in .git/ directly with newer Git versions ... Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete it somewhere else. Just in case somebody wants to use a newer git-gui with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if it exists). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2008-07-13 17:58:40 -04:00
lib	git-gui: MERGE_RR lives in .git/ directly with newer Git versions	2008-07-13 17:58:40 -04:00
macosx	git-gui: support Git Gui.app under OS X 10.5	2008-02-12 02:34:45 -05:00
po	git-gui: Update German translation	2008-05-01 18:13:14 -04:00
windows	git-gui: add mingw specific startup wrapper	2007-10-10 03:50:01 -04:00
.gitignore	git-gui: Honor a config.mak in git-gui's top level	2007-10-13 22:14:14 -04:00
GIT-VERSION-GEN	git-gui 0.10	2008-04-02 02:17:11 -04:00
Makefile	git-gui: Simplify MSGFMT setting in Makefile	2008-03-12 01:48:32 -04:00
git-gui.sh	git-gui: Exit shortcut in MacOSX repaired	2008-07-08 00:51:04 -04:00