comparison hgmerge @ 3376:1106e00e6847

Add popen2 demandload to patch.py, required by diffstat
author Brendan Cully <brendan@kublai.com>
date Thu, 12 Oct 2006 16:34:32 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3375:9fe62e2db71d 3376:1106e00e6847