annotate tests/tampered.hg @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents e9d3a11eacad
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7586
e9d3a11eacad test-audit-path: add one more test (issue 1450)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 7554
diff changeset
1 (binary:application/octet-stream)