diff tests/test-merge7.out @ 3115:c4e26f1ccfcc

merge: eliminate redundant security check duplicated in applyupdates
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 19:54:01 -0500
parents 40e777bda455
children 2ef0b3aae186
line wrap: on
line diff