Clarify kind of conflict in merge-one-file helper
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 483 git-gui.sh