rerere: add note about files with existing conflict markers
[git.git] / git-gui / 
treebc2a7aff82eec5c356efe3934712d50da62c375d
drwxr-xr-x   ..
-rw-r--r-- 194 .gitattributes
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11817 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 102062 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows