diff mercurial/transaction.py @ 85:58a1a0425c9b

Fix merge bug, I hope
author mpm@selenic.com
date Tue, 17 May 2005 11:40:45 -0800
parents 42177b56b949
children 589f507bb259
line wrap: on
line diff