merge: make merge.renormalize work for all uses of merge machinery
[git] / git-gui / windows /
drwxr-xr-x   ..
-rwxr-xr-x 687 git-gui.sh