diff tests/test-conflict @ 2974:eef469259745

tag: shorten hash in default commit message Move default message to commands.py Pass node in binary for consistency Remove default arguments Fix up tests
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Aug 2006 23:52:52 -0500
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff