Mercurial > hg
view tests/test-diff-subdir.out @ 12228:3ccd5b999500 stable
i18n: merge with stable
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Thu, 26 Aug 2010 22:27:20 -0300 |
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