Mercurial > hg
comparison tests/test-extdiff.t @ 28053:34a2944aac9b
check-code: add rule to detect usage of external diff via extdiff
This rule detects "hg extdiff" invocation without -p/--program and
-o/--option.
This patch specifies "-p diff" explicitly in test-extdiff.t to avoid
false positive matching.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Thu, 11 Feb 2016 02:15:45 +0900 |
| parents | 0945539a3a6b |
| children | 67b180c0e263 |
comparison
equal
deleted
inserted
replaced
| 28052:b59ef0c21405 | 28053:34a2944aac9b |
|---|---|
| 70 [1] | 70 [1] |
| 71 #endif | 71 #endif |
| 72 | 72 |
| 73 Specifying an empty revision should abort. | 73 Specifying an empty revision should abort. |
| 74 | 74 |
| 75 $ hg extdiff --patch --rev 'ancestor()' --rev 1 | 75 $ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1 |
| 76 abort: empty revision on one side of range | 76 abort: empty revision on one side of range |
| 77 [255] | 77 [255] |
| 78 | 78 |
| 79 Test diff during merge: | 79 Test diff during merge: |
| 80 | 80 |