new test for conflicts.
[darcs2git.git] / .gitignore
blobc3aad5066290bad8de4eedaf903a11e5ac99d683
1 gitdest
2 darcs2git.tmpdarcs