Code

git-gui: Convert merge dialog to use class system
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 4756 Makefile
-rwxr-xr-x 64294 git-gui.sh
drwxr-xr-x - lib