##// END OF EJS Templates
add cmdutil.remoteui...
add cmdutil.remoteui remoteui sorts out the issues of getting ssh config options from the local repo into the remote one while not copying other options like hooks.

File last commit:

r6375:cdc458b1 default
r8188:f3abe032 default
Show More
test-issue619.out
10 lines | 314 B | text/plain | TextLexer
/ tests / test-issue619.out
Matt Mackall
merge: make test for fast-forward merge stricter (issue619)...
r4748 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
Matt Mackall
update: better logic and messages for updates...
r6375 abort: can't merge with ancestor
Matt Mackall
merge: make test for fast-forward merge stricter (issue619)...
r4748 done