Use nice names in conflict markers during cherry-pick/revert.
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: 6e2931a8ed887bd75ed68085a7e04bc88574d69e)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign