view 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
line wrap: on
line source

(binary:application/octet-stream)