view tests/test-diff-copy-depth.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

-- 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