view tests/test-diff-copy-depth.out @ 11453:2ee26044d846 stable

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Fri, 18 Jun 2010 08:48:05 +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