view tests/test-merge4.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 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)