diff -r e1f0ec0b7d2d -r e40343ce9c4c tests/test-diff-unified.t
--- a/tests/test-diff-unified.t	Tue Sep 13 22:57:57 2016 -0400
+++ b/tests/test-diff-unified.t	Tue Aug 30 15:55:07 2016 -0400
@@ -333,4 +333,20 @@
   +    return a + b + c + e;
    }
 
+If [diff] git is set to true, but the user says --no-git, we should
+*not* get git diffs
+  $ hg diff --nodates --config diff.git=1 --no-git
+  diff -r f2c7c817fa55 f1
+  --- a/f1
+  +++ b/f1
+  @@ -2,6 +2,6 @@
+       int a = 0;
+       int b = 1;
+       int c = 2;
+  -    int d = 3;
+  -    return a + b + c + d;
+  +    int e = 3;
+  +    return a + b + c + e;
+   }
+
   $ cd ..