comparison tests/test-merge-revert2.out @ 2829:4870f795f681

Merge: combine force and forcemerge arguments
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 10:56:48 -0500
parents b2ae81a7df29
children ad6f34c83c3d
comparison
equal deleted inserted replaced
2828:0f787997e3c2 2829:4870f795f681