comparison tests/test-merge5 @ 5574:d4ec6d61b3ee

imported patch rev-help
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 15:25:37 -0600
parents fffc8a733bf9
children 6aa4a3fa4e60
comparison
equal deleted inserted replaced
5573:e2da5b340651 5574:d4ec6d61b3ee