##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

cmdutil: always expose "files_add", "files_del" and "manifest" templater properties
cmdutil: always expose "files_add", "files_del" and "manifest" templater properties
Matt Mackall - - Load All Authors

File last commit:

r4748:8808ea7d default
r5545:5a124ce4 default
Show More
test-issue619.out
10 lines | 358 B | text/plain | TextLexer
/ tests / test-issue619.out
History | Annotation | Raw |Copy content |Copy permalink
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