merge-recursive: fix the fix to the diff3 common ancestor label
[git.git] / contrib / hg-to-git / 
tree67587c50fa545b02a5a80f21fcc858cb3ecbe007
drwxr-xr-x   ..
-rwxr-xr-x 8021 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt