Mercurial > hg
view tests/test-diff-subdir.out @ 2953:3d5547845158
fix issue 322.
do not allow to add files that shadow files or directories already in dirstate.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 18 Aug 2006 21:03:29 -0700 |
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