annotate tests/darcs1.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 5bfab61c2fee
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12407
5bfab61c2fee tests: fold darcs test repository into a bundle
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 (binary:application/octet-stream)