diff tests/test-merge6.out @ 8710:bcb6e5bebd93

commit: trade O(n^2) file checks for O(n^2) dir checks
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Jun 2009 22:13:08 -0500
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line diff