mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
cfe7a0a522
don't allow merging with an ancestor fix != on contexts add a test
11 lines
358 B
Plaintext
11 lines
358 B
Plaintext
adding a
|
|
marked working directory as branch b
|
|
adding b
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
fast-forward
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
bogus fast-forward should fail
|
|
abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
|
|
done
|