git-gui: Do not munge conflict marker lines in a normal diff
tree2bc92ea7a6fec62f99401063651653f487cd9ac2
-rw-r--r-- 84 .gitattributes
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11490 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 83083 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows