Mercurial > hg
view tests/test-diff-subdir.out @ 9403:3738c8cff1bf
test-keyword: update output to match 5d49fdef6fd0
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 27 Aug 2009 00:00:15 +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