##// END OF EJS Templates
abort when merging two heads and repository has local changes
abort when merging two heads and repository has local changes

File last commit:

r1261:fccc90f1 default
r1581:db10b711 default
Show More
test-hup.out
10 lines | 118 B | text/plain | TextLexer
0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.d
00changelog.i
data
journal.dirstate