git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/test-parse-options.c b/test-parse-options.c
index 277cfe4d6dceb5ebe2ce9f141b6eb21a4dc37912..73360d75126af2f231b3cfdad26a47e18fff0a39 100644 (file)
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -18,6 +18,10 @@ int main(int argc, const char **argv)
                OPT_GROUP("string options"),
                OPT_STRING('s', "string", &string, "string", "get a string"),
                OPT_STRING(0, "string2", &string, "str", "get another string"),
+               OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
+               OPT_STRING('o', NULL, &string, "str", "get another string"),
+               OPT_GROUP("magic arguments"),
+               OPT_ARGUMENT("quux", "means --quux"),
                OPT_END(),
        };
        int i;