Mercurial > hg
diff contrib/simplemerge @ 17407:31c123a2f273
histedit: factored out diff/patch logic
This patch is the first step towards a refactoring of the histedit
extension to use underlying graft machinery instead of diff/patch as
discussed in issue3527. Replacing diff/patch with graft is necessary
to fix, for example, issue3582.
| author | Leah Xue <leahxue@fb.com> |
|---|---|
| date | Tue, 21 Aug 2012 16:06:34 -0700 |
| parents | 659f34b833b9 |
| children | cba222f01056 |