diff tests/test-conflict @ 3434:d0459ec1455d

Add branch support to commit
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:32:00 -0500
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff