equal
deleted
inserted
replaced
15 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
16 $ echo "foo2" > foo.whole |
16 $ echo "foo2" > foo.whole |
17 $ hg commit -Aqm "foo 2" |
17 $ hg commit -Aqm "foo 2" |
18 |
18 |
19 $ hg --config extensions.rebase= rebase -r 1 -d 0 |
19 $ hg --config extensions.rebase= rebase -r 1 -d 0 |
20 rebasing 1:c3b6dc0e177a "foo 2" (tip) |
20 rebasing 1:c3b6dc0e177a tip "foo 2" |
21 merging foo.whole |
21 merging foo.whole |
22 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
22 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
23 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
23 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
24 [1] |
24 [1] |
25 |
25 |