##// END OF EJS Templates
merge: move messages about possible conflicts a litte earlier...
merge: move messages about possible conflicts a litte earlier I actually wanted to reduce the amount of code around the call to applyupdates(), so I tried moving these warnings a little earlier, and I think it makes the output make a little more sense (see changes to test cases).
Martin von Zweigbergk -
r26957:d16d7317 default
Show More
Name Size Modified Last Commit Author
/ mercurial / default.d
mergetools.rc Loading ...