| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Sun, 02 Nov 2008 22:44:42 +0100 | |
| changeset 7304 | 68374f1c8c87 |
| parent 6888 | 7c36a4fb05a3 |
| child 7821 | 9fe7e6acf525 |
| 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 % Correct the conflict without marking the file as resolved abort: unresolved merge conflicts (see hg resolve) % Mark the conflict as resolved and commit