diff tests/test-bad-pull @ 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 66249be9aa23
children e3a0c092b4e2
line wrap: on
line diff