diff mercurial/demandload.py @ 1495:1e265c2bec94

Deal with merge abort more gracefully We save parent info last rather than first.
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Nov 2005 20:22:29 -0800
parents 3db700146536
children f3abe0bdccdd
line wrap: on
line diff