checkout --conflict=<style>: recreate merge in a non-default style
[git/spearce.git] / git-gui / 
treec993789618d5d9d2993d8e2a15bb95c2d8a93c27
drwxr-xr-x   ..
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 74526 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows