t6023: merge-file fails to output anything for a degenerate merge
[git/debian.git] / git-gui / 
treeabb7c690e77482cbc59e7e88780054a89b742195
drwxr-xr-x   ..
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 74525 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows