comparison tests/test-merge4.t @ 16094:0776a6cababe

merge: don't use unknown() This removes use of unknown files for building the synthetic working directory manifest used by manifestmerge. Instead, we adopt the strategy used by _checkunknown. Side-effect: unknown files are no longer moved by remote directory renames, and now are left alone like ignored files.
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Feb 2012 17:04:17 -0600
parents 4c94b6d0fb1c
children 63c817ea4a70
comparison
equal deleted inserted replaced
16093:7e30f5f2285f 16094:0776a6cababe