Mercurial > hg
view tests/test-commit-unresolved.out @ 7866:b2c18c795622
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 20 Mar 2009 18:55:20 -0500 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Merging a conflict araises merging A warning: conflicts during merge. merging A failed! 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon % Correct the conflict without marking the file as resolved abort: unresolved merge conflicts (see hg resolve) % Mark the conflict as resolved and commit