Mercurial > hg
view tests/test-diff-copy-depth.out @ 11123:8dd69bee71da stable
convert/svn: tree conflicts no longer happen now we use memctx
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 01 May 2010 16:29:27 +0200 |
parents | d8f44384c3ee |
children |
line wrap: on
line source
-- With aaa Status: A somename other-file Diff: diff --git a/other-file b/somename copy from other-file copy to somename -- With zzz Status: A somename other-file Diff: diff --git a/other-file b/somename copy from other-file copy to somename