git-gui: Move merge support into a namespace
treef14239d661fcc0ce25cc4cb44b621eb8cd5ba599
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 2776 Makefile
-rwxr-xr-x 55627 git-gui.sh
drwxr-xr-x - lib