view tests/test-merge4.out @ 6761:cb981fc955fb

remove: work directly off status This allows us to use a single directory walk and to trivially ignore unknown files. The resulting code is also easier to follow.
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Jun 2008 14:53:30 -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)