Mercurial > hg
changeset 2769:2ace3bf43089
tests: fix output for test-backout
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Wed, 02 Aug 2006 13:04:36 -0700 |
| parents | b1b1aa6f275c |
| children | 5f8259e4d292 |
| files | tests/test-backout.out |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-backout.out Wed Aug 02 12:46:00 2006 -0700 +++ b/tests/test-backout.out Wed Aug 02 13:04:36 2006 -0700 @@ -27,7 +27,7 @@ reverting a changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5 the backout changeset is a new head - do not forget to merge -(use "backout -m" if you want to auto-merge) +(use "backout --merge" if you want to auto-merge) b: No such file or directory adding a adding b