Mercurial > hg
comparison tests/test-subrepo-deep-nested-change.t @ 26959:ed5f20f9c22e stable
resolve: restore .orig only after merge is fully complete (issue4952)
Previously, we'd restore the .orig file after the premerge is complete but
before the merge was complete. This would lead to the .orig file potentially
containing merge conflict markers in it, as a leftover from the last merge
attempt.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 13 Nov 2015 15:56:02 -0800 |
| parents | 4b0fc75f9403 |
| children | 0707bbec682d 97175d9bf7cf |
comparison
equal
deleted
inserted
replaced
| 26945:8a256cee72c8 | 26959:ed5f20f9c22e |
|---|