Mercurial > public > mercurial-scm > hg-stable

view tests/test-simplemerge.py.out @ 26957:d16d73173fdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK