comparison contrib/hgk.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 c5594ff3f95c
children 0952d164030e
comparison
equal deleted inserted replaced
1494:249ca10d37f4 1495:1e265c2bec94