comparison mercurial/merge.py @ 10750:92ff2d0b751a

run-tests: make sure GREP_OPTIONS isn't set This can interfere with test output, especially for options like --color.
author Brodie Rao <brodie@bitheap.org>
date Mon, 22 Mar 2010 01:36:12 -0400
parents 0e64d814d7d0
children 7a0d096e221e
comparison
equal deleted inserted replaced
10746:16b9aa398c28 10750:92ff2d0b751a