diff mercurial/ancestor.py @ 3248:7a0d70b69d74

merge: reorder dirstate update slightly for correctness
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 14:09:26 -0500
parents b1db258e875c
children eb0b4a2d70a9
line wrap: on
line diff