view tests/test-merge3.out @ 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 91c56c427171
children
line wrap: on
line source

removing b
nothing changed