Mercurial > hg
comparison contrib/simplemerge @ 14385:7709cc983025
patch: git metadata was ignored if strip > 1
gitpatch objects emitted by iterhunks() are modified in place by applydiff().
Processing them earlier improves iterhunks() isolation. applydiff() modifying
them should still be fixed though.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 19 May 2011 22:44:01 +0200 |
parents | 659f34b833b9 |
children | cba222f01056 |
comparison
equal
deleted
inserted
replaced
14384:9d59c596eb9e | 14385:7709cc983025 |
---|