Mercurial > hg
diff tests/test-backout.out @ 11181:6e65b451b62e
commit: fix complaint about branch merge creating new heads (issue2186)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 15 May 2010 21:24:23 -0500 |
parents | 39e7f14a8286 |
children | b66e414d38b0 |
line wrap: on
line diff
--- a/tests/test-backout.out Sat May 15 00:34:07 2010 +0300 +++ b/tests/test-backout.out Sat May 15 21:24:23 2010 -0500 @@ -73,7 +73,6 @@ marked working directory as branch branch2 adding file2 removing file1 -created new head changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge)