Mercurial > hg
comparison tests/test-convert-tagsbranch-topology.t @ 17647:d34ba4991188
histedit: replaces patching logic by merges
The old and fragile patching logic is replaced by smart merges (as rebase and
graft do). This should prevents some conflicts and smoother human resolution.
For this purpose the "foldchanges" function is renamed to "applychanges" and
handle a single revision only.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 21 Sep 2012 19:27:22 +0200 |
| parents | 8f36806b8f6a |
| children | aa9385f983fa |
comparison
equal
deleted
inserted
replaced
| 17646:d44731a3adb8 | 17647:d34ba4991188 |
|---|