comparison tests/test-merge4.t @ 12488:73ad7274ccfa

tests: unify test-simplemerge-cmd
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Sep 2010 13:44:49 -0500
parents 4c94b6d0fb1c
children 63c817ea4a70
comparison
equal deleted inserted replaced
12487:9792013e2f53 12488:73ad7274ccfa