Mercurial > hg
comparison tests/test-mq-qdiff.out @ 9857:24bc6e414610
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Nov 2009 14:21:53 +0100 |
parents | 4fe9ca519637 |
children | 99d285ac5da4 |
comparison
equal
deleted
inserted
replaced
9856:ed362d41d1f6 | 9857:24bc6e414610 |
---|---|
83 + | 83 + |
84 + | 84 + |
85 1 | 85 1 |
86 2 | 86 2 |
87 3 | 87 3 |
88 % qdiff --inverse | 88 % qdiff --reverse |
89 diff -r 35fb829491c1 lines | 89 diff -r 35fb829491c1 lines |
90 --- a/lines | 90 --- a/lines |
91 +++ b/lines | 91 +++ b/lines |
92 @@ -1,11 +1,9 @@ | 92 @@ -1,11 +1,9 @@ |
93 - | 93 - |