new test for conflicts.
tree8c87512dd1612415c5f2d506976e7279896da700
-rw-r--r-- 27 .gitignore
-rw-r--r-- 348 Makefile
-rw-r--r-- 15665 darcs2git.py
drwxr-xr-x - tests