Mercurial > public > mercurial-scm > hg-stable
view mercurial/__init__.py @ 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 | 9117c6561b0b |
| children | 4374d819ccd5 |