git-gui: Allow git-merge to use branch names in conflict markers
treede74e0ff54a25ae88ce8cdb8c05cdc7585143d29
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 4756 Makefile
-rwxr-xr-x 65103 git-gui.sh
drwxr-xr-x - lib