author | Vadim Gelfer <vadim.gelfer@gmail.com> |
Fri, 04 Aug 2006 10:37:40 -0700 | |
changeset 2781 | a9fadbef21e9 |
parent 2780 | e7f70588af30 |
child 2782 | 0148869345f7 |
--- a/tests/test-backout.out +++ b/tests/test-backout.out @@ -27,7 +27,7 @@ adding b 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