##// END OF EJS Templates
merge with other head by default, not tip....
merge with other head by default, not tip. fixes issue 339.

File last commit:

r2223:b7256206 default
r2915:013921c7 default
Show More
test-hup.out
9 lines | 104 B | text/plain | TextLexer
0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.i
data
journal.dirstate