Merge branch 'jc/1.7.0-diff-whitespace-only-status'

* jc/1.7.0-diff-whitespace-only-status:
  diff.c: fix typoes in comments
  Make test case number unique
  diff: Rename QUIET internal option to QUICK
  diff: change semantics of "ignore whitespace" options

Conflicts:
	diff.h

diff --cc builtin-log.c
Simple merge

diff --cc builtin-rev-list.c
index 91b604289dd59101cb6477fa49dd9c342e5b39e5,69753dc2060677103f79496c382d2331849c28e5..cd97ded4d249b3beb5179150a283e8be43b9ba44
--- 1/builtin-rev-list.c
--- 2/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@@ -319,10 -319,8 +319,10 @@@ int cmd_rev_list(int argc, const char *
  
        memset(&info, 0, sizeof(info));
        info.revs = &revs;
 +      if (revs.bisect)
 +              bisect_list = 1;
  
-       quiet = DIFF_OPT_TST(&revs.diffopt, QUIET);
+       quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
        for (i = 1 ; i < argc; i++) {
                const char *arg = argv[i];
  

diff --cc diff-lib.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
index 15fcecdecd9b033700902de44138eafdb66932eb,a7e7ccbd4230ca5cc65ea7e9255ecc345eb8f169..6f6d0ed01d9212289784cf7250358320f64b72cc
--- 1/diff.h
--- 2/diff.h
+++ b/diff.h
@@@ -66,9 -66,7 +66,9 @@@ typedef void (*diff_format_fn_t)(struc
  #define DIFF_OPT_DIRSTAT_CUMULATIVE  (1 << 19)
  #define DIFF_OPT_DIRSTAT_BY_FILE     (1 << 20)
  #define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
- 
+ #define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
 +#define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
 +
  #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
  #define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)

diff --cc revision.c
Simple merge