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

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

Update output for test-merge5.
Bryan O'Sullivan -
r819:77e121a0 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -9,4 +9,4 b' removing b'
9 this update spans a branch affecting the following files:
9 this update spans a branch affecting the following files:
10 b
10 b
11 aborting update spanning branches!
11 aborting update spanning branches!
12 (use update -m to perform a branch merge)
12 (use update -m to merge across branches or -C to lose changes)
General Comments 0
You need to be logged in to leave comments. Login now