diff tests/test-merge-default.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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff