git-gui: MERGE_RR lives in .git/ directly with newer Git versions
treeb0b23106454701c145b8073ae0d042bbe2c75de2
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11186 Makefile
-rwxr-xr-x 73976 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows