Mercurial > hg
view tests/test-rebase-conflicts.out @ 7080:a6477aa893b8
tests: Windows compatibility fixes
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 12 Oct 2008 19:11:59 +0200 |
parents | 808f03f61ebe |
children | 45495d784ad6 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1 % Try to call --continue abort: no rebase in progress % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Try to continue without solving the conflict abort: unresolved merge conflicts (see hg resolve) % Conclude rebase saving bundle to adding branch adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files rebase completed @ 4: L2 | o 3: L1 | o 2: C3 | o 1: C2 | o 0: C1