Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 2038:5c4496ed152d
Tell the user the real "hg update -C" command, not just "-C" when aborting.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 02 Apr 2006 18:16:06 +0200 |
parents | ced2d3620f95 |
children | 2ff37e3bf780 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -101,7 +101,7 @@ this update spans a branch affecting the a (resolve) b (resolve) aborting update spanning branches! -(use 'hg merge' to merge across branches or '-C' to lose changes) +(use 'hg merge' to merge across branches or 'hg update -C' to lose changes) failed abort: outstanding uncommitted changes failed