Mercurial > hg
view tests/test-diff-subdir.out @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 18:09:52 +0100 |
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