diff hgweb.cgi @ 26957:d16d73173fdd

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).
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 12 Nov 2015 13:14:03 -0800
parents 4b0fc75f9403
children 47ef023d0165
line wrap: on
line diff