Use nice names in conflict markers during cherry-pick/revert.
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: 6e2931a8ed887bd75ed68085a7e04bc88574d69e)
-rw-r--r-- 22067 Git.pm
-rw-r--r-- 1003 Makefile
-rw-r--r-- 588 Makefile.PL
-rw-r--r-- 19087 private-Error.pm