diff tests/test-conflict @ 2851:b4f05ecf4ee8

Switch to simpler manifestdict
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Aug 2006 22:38:56 -0500
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff