diff mercurial/merge.py @ 8094:60a9e3cf0cf4

run-tests: factor out main(); reduce use of globals a bit.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 20 Apr 2009 21:42:20 -0400
parents 89e05c02a4af
children 496ae1ea4698
line wrap: on
line diff