Mercurial > hg
comparison tests/test-diff-subdir.t @ 24455:16961d43dc89
diff: rename --relative option to --root
The diff output format is unable to express files outside the directory so it
makes sense to name this option --root instead of --relative.
| author | Sean Farley <sean@farley.io> |
|---|---|
| date | Wed, 25 Mar 2015 11:55:15 -0700 |
| parents | e22248f6d257 |
| children |
comparison
equal
deleted
inserted
replaced
| 24454:59904edf0a5e | 24455:16961d43dc89 |
|---|---|
| 45 +2 | 45 +2 |
| 46 | 46 |
| 47 relative to beta | 47 relative to beta |
| 48 | 48 |
| 49 $ cd .. | 49 $ cd .. |
| 50 $ hg diff --nodates --relative beta | 50 $ hg diff --nodates --root beta |
| 51 diff -r 7d5ef1aea329 two | 51 diff -r 7d5ef1aea329 two |
| 52 --- a/two | 52 --- a/two |
| 53 +++ b/two | 53 +++ b/two |
| 54 @@ -0,0 +1,1 @@ | 54 @@ -0,0 +1,1 @@ |
| 55 +2 | 55 +2 |
| 56 | 56 |
| 57 inside beta | 57 inside beta |
| 58 | 58 |
| 59 $ cd beta | 59 $ cd beta |
| 60 $ hg diff --nodates --relative . | 60 $ hg diff --nodates --root . |
| 61 diff -r 7d5ef1aea329 two | 61 diff -r 7d5ef1aea329 two |
| 62 --- a/two | 62 --- a/two |
| 63 +++ b/two | 63 +++ b/two |
| 64 @@ -0,0 +1,1 @@ | 64 @@ -0,0 +1,1 @@ |
| 65 +2 | 65 +2 |