comparison tests/test-merge7.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 92ccccb55ba3
children 9fe7e6acf525
comparison
equal deleted inserted replaced
7529:0a65a1dd7894 7530:3773e510d433