diff mercurial/commands.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 bfd73b567b3d
children d59ed18ec2d0 cba2a689117d
line wrap: on
line diff