author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
Tue, 02 Mar 2010 12:41:27 +0900 | |
branch | stable |
changeset 10565 | 461c2159937f |
parent 9468 | b2310903c462 |
permissions | -rw-r--r-- |
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 update -C' 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