diff mercurial/context.py @ 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 8808ea7da86b
children e45c5120ca27
line wrap: on
line diff