diff tests/test-merge-default.out @ 3560:09d99b7e4da0

simplify dirstate walking - kill walkhelper - stop passing dc around - remove unused stat arg from statmatch (renamed imatch)
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Oct 2006 23:54:24 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff