merge-tree: remove unused df_conflict arguments
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 57065289a9ef2fc962ec7f82f9771b45eba8dba1)
-rw-r--r-- 608 AppMain.tcl
-rw-r--r-- 985 Info.plist
-rw-r--r-- 28866 git-gui.icns