diff mercurial/ancestor.py @ 6523:98dfc5751fdc

test-imerge: disable due to massive brokenness
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 11 Apr 2008 22:17:20 -0700
parents 532ca442b903
children 8d78fc991b71
line wrap: on
line diff