##// END OF EJS Templates
rebase: avoid redundant merges (issue1301)
rebase: avoid redundant merges (issue1301)

File last commit:

r6336:4b0c9c67 default
r7278:45495d78 default
Show More
test-merge-force.out
11 lines | 298 B | text/plain | TextLexer
/ tests / test-merge-force.out
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
r6255 % local deleted a file, remote removed
Alexis S. L. Carvalho
merge: require --force when there are deleted files
r6256 abort: outstanding uncommitted changes
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
r6255 resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b