Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-subdir.out @ 4904:59b8ff35c4ed
patch: patches should be read and written in binary mode when possible.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 17 Jul 2007 23:35:24 +0200 |
parents | 66eff8355168 |
children |
line wrap: on
line source
EVERYTHING diff -r ec612a6291f1 alpha/one --- a/alpha/one +++ b/alpha/one @@ -0,0 +1,1 @@ +1 diff -r ec612a6291f1 beta/two --- a/beta/two +++ b/beta/two @@ -0,0 +1,1 @@ +2 BETA ONLY diff -r ec612a6291f1 beta/two --- a/beta/two +++ b/beta/two @@ -0,0 +1,1 @@ +2 INSIDE BETA diff -r ec612a6291f1 beta/two --- a/beta/two +++ b/beta/two @@ -0,0 +1,1 @@ +2