comparison tests/test-merge2.out @ 5973:ea77f6f77514

patchbomb: undo backout and fix bugs in the earlier patch
author Matt Mackall <mpm@selenic.com>
date Thu, 31 Jan 2008 14:44:19 -0600
parents b2ae81a7df29
children 4b0c9c674707
comparison
equal deleted inserted replaced
5972:d83020d0466f 5973:ea77f6f77514