diff tests/test-merge3 @ 9646:5b001f534452

commands: adding --no-status to resolve to match status
author timeless <timeless@gmail.com>
date Sun, 25 Oct 2009 13:27:54 +0100
parents 7544700fd931
children 6a64813276ed
line wrap: on
line diff