Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-addremove.out @ 1664:4338e33c973b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents eef8ff46567a
children 4e35843b2683
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