Use nice names in conflict markers during cherry-pick/revert.
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 6e2931a8ed887bd75ed68085a7e04bc88574d69e)
-rw-r--r-- 3144 README
-rw-r--r-- 164 git-favicon.png
-rw-r--r-- 208 git-logo.png
-rw-r--r-- 6574 gitweb.css
-rwxr-xr-x 138821 gitweb.perl
drwxr-xr-x - test