git-merge-file --ours, --theirs
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 73eb40eeaaebc5ebae283c06286b96b4aea00143)
-rw-r--r-- 633 git-gui.sh