view tests/test-diff-copy-depth.out @ 11716:db426935fa94 stable

progress: use gerund (updating) for merge progress
author timeless <timeless@gmail.com>
date Fri, 30 Jul 2010 10:32:24 +0300
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