Use nice names in conflict markers during cherry-pick/revert.
[git] / contrib / gitview /
drwxr-xr-x   ..
-rwxr-xr-x 29816 gitview
-rw-r--r-- 827 gitview.txt