git-revert with conflicts to behave as git-merge with conflicts
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: a9cb3c6e)
-rw-r--r-- 22070 Git.pm
-rw-r--r-- 563 Makefile.PL
-rw-r--r-- 19087 private-Error.pm