Mercurial > hg
view tests/test-addremove.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | ff3ea21a981a |
children | c978d6752dbb |
line wrap: on
line source
adding dir/bar adding foo dir/bar foo adding dir/bar_2 adding foo_2 dir/bar_2 foo_2 adding a adding c adding b adding d removing a removing c recording removal of a as rename to b (100% similar)