Mercurial > hg
comparison tests/test-http-branchmap.t @ 26621:36383507a6f8
resolve: perform all premerges before performing any file merges (BC)
Just like the BC to merge before it, this allows for a maximally consistent
state before providing any prompts to the user.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 23:58:07 -0700 |
| parents | 4d2b9b304ad0 |
| children | d83ca854fa21 |
comparison
equal
deleted
inserted
replaced
| 26620:7955127efbcb | 26621:36383507a6f8 |
|---|