merge_content(): Check whether D/F conflicts are still present
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 4ab9a157d06956ce5a1060a28404cbade3039fa2)
-rw-r--r-- 556 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns