view tests/test-addremove.out @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
parents 627399330c7d
children
line wrap: on
line source

adding dir/bar
adding foo
dir/bar
foo
committed changeset 0:d44511117907
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2
committed changeset 1:a85812e0561a
adding a
adding c
removing a
adding b
removing c
adding d
recording removal of a as rename to b (100% similar)
removing a
adding b
removing c
adding d
recording removal of a as rename to b (100% similar)