hg-fast-export.py: Rewrite merge logic
treee42fbd6cf57050d4375d66b0ab67402026161cb5
-rw-r--r-- 42 .gitignore
-rw-r--r-- 341 Makefile
-rwxr-xr-x 11663 hg-fast-export.py
-rwxr-xr-x 2536 hg-fast-export.sh
-rw-r--r-- 2091 hg-fast-export.txt
-rwxr-xr-x 4369 hg-reset.py
-rwxr-xr-x 1412 hg-reset.sh
-rwxr-xr-x 2839 hg2git.py
-rw-r--r-- 6336 svn-archive.c
-rw-r--r-- 5227 svn-fast-export.c
-rwxr-xr-x 5558 svn-fast-export.py