view tests/test-locate.out @ 3257:c93ce7f10f85

merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 19:08:04 -0500
parents 041363739ca8
children 8e947b0e53cc
line wrap: on
line source

adding a
adding b
adding t.h
adding t/x
a
NONEXISTENT: No such file or directory
a
b
t.h
t/x
a: No such file or directory
NONEXISTENT: No such file or directory
b
t.h
t/x
a
NONEXISTENT: No such file in rev ce18e5bc5cd3
a
t/x
b
t.h
% -I/-X with relative path should work
b
t.h
t/x
t/x
t/x