view tests/test-simplemerge-cmd.out @ 7530:3773e510d433 1.1.1

resolve: clarify and simplify help
author Matt Mackall <mpm@selenic.com>
date Fri, 19 Dec 2008 20:58:33 -0600
parents ea7b982b6c08
children e1f4343db740
line wrap: on
line source

(binary:application/octet-stream)