git-gui: Don't allow staging files with conflicts.
[git/dscho.git] / windows / 
tree144728d0ff4a4794cc1a6e003b28c46342116906
drwxr-xr-x   ..
-rw-r--r-- 483 git-gui.sh