Mercurial > hg
view tests/test-git-import.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | b70740aefa4d |
children | 1c9b6f1237e0 |
line wrap: on
line source
% new file applying patch from stdin % chmod +x applying patch from stdin % copy applying patch from stdin a a % rename applying patch from stdin copyx new rename % delete applying patch from stdin new rename % regular diff applying patch from stdin % copy and modify applying patch from stdin a a b a a % rename and modify applying patch from stdin copy2: No such file or directory a a b c a