Merge branch 'jc/better-conflict-resolution'
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 9ba929ed652f5ed7707f1c684999af4ad02c4925)
-rw-r--r-- 483 git-gui.sh