Mercurial > hg-stable
diff tests/test-batching.py @ 31185:7433b3bc55ee
update: for "noconflict" updates, print "conflicting changes" on conflict
With experimental.updatecheck=noconflict, if the update is aborted
because of conlicts, "uncommitted changes" is not quite
accurate. Let's use "conflicting changes" instead. Also fix the hint
to recomment --clean, not --merge, since that's what we do for other
failed updates.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 Mar 2017 23:21:27 -0800 |
parents | 544908ae36ce |
children | e2fc2122029c |