Mercurial > hg
comparison tests/test-mq-qnew.t @ 42597:51e52a495214
mq: fix for merge detection methods
Differential Revision: https://phab.mercurial-scm.org/D6548
| author | Taapas Agrawal <taapas2897@gmail.com> |
|---|---|
| date | Thu, 20 Jun 2019 01:08:56 +0530 |
| parents | 12243f15d53e |
| children | c6d31e659a28 |
comparison
equal
deleted
inserted
replaced
| 42596:83666f011679 | 42597:51e52a495214 |
|---|---|
| 162 merging a | 162 merging a |
| 163 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 163 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 164 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 164 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 165 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 165 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
| 166 (no more unresolved files) | 166 (no more unresolved files) |
| 167 abort: outstanding uncommitted merge | 167 abort: cannot manage merge changesets |
| 168 (use 'hg commit' or 'hg merge --abort') | |
| 169 $ rm -r sandbox | 168 $ rm -r sandbox |
| 170 | 169 |
| 171 hg headers | 170 hg headers |
| 172 | 171 |
| 173 $ echo "plain=false" >> $HGRCPATH | 172 $ echo "plain=false" >> $HGRCPATH |
| 242 merging a | 241 merging a |
| 243 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 242 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 244 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 243 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 245 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 244 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
| 246 (no more unresolved files) | 245 (no more unresolved files) |
| 247 abort: outstanding uncommitted merge | 246 abort: cannot manage merge changesets |
| 248 (use 'hg commit' or 'hg merge --abort') | |
| 249 $ rm -r sandbox | 247 $ rm -r sandbox |
| 250 | 248 |
| 251 Test saving last-message.txt | 249 Test saving last-message.txt |
| 252 | 250 |
| 253 $ hg init repo | 251 $ hg init repo |