comparison tests/test-convert-git.out @ 5340:ad8783fe20f7

darcs2hg: Now detects and recovers from simple darcs conflicts.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:13:54 -0400
parents 5c2ca6d6ab21
children 88e931f74e8b
comparison
equal deleted inserted replaced
5339:b62a59fa9d26 5340:ad8783fe20f7