Mercurial > hg
comparison tests/test-largefiles-update.t @ 45150:dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Differential Revision: https://phab.mercurial-scm.org/D8730
| author | Daniel Ploch <dploch@google.com> |
|---|---|
| date | Mon, 13 Jul 2020 16:42:44 -0700 |
| parents | f6540aba8e3e |
| children | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
| 45149:87047efbc6a6 | 45150:dc5e5577af39 |
|---|---|
| 591 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 | 591 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
| 592 you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5. | 592 you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5. |
| 593 what do you want to do? o | 593 what do you want to do? o |
| 594 merging normal1 | 594 merging normal1 |
| 595 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') | 595 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') |
| 596 unresolved conflicts (see hg resolve, then hg rebase --continue) | 596 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 597 [1] | 597 [1] |
| 598 $ cat .hglf/large1 | 598 $ cat .hglf/large1 |
| 599 58e24f733a964da346e2407a2bee99d9001184f5 | 599 58e24f733a964da346e2407a2bee99d9001184f5 |
| 600 $ cat large1 | 600 $ cat large1 |
| 601 large1 in #1 | 601 large1 in #1 |