diff hgmerge @ 2937:9dc568f5e03d

Fix test-mq-qdiff; add -I and -X options to qdiff
author Brendan Cully <brendan@kublai.com>
date Wed, 16 Aug 2006 19:51:39 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff