Mercurial > hg
diff mercurial/patch.py @ 5349: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 | 7a7d4937272b |
children | 5ee5cbfceff3 |