Merge branch 'ds/push-squelch-ambig-warning'

diff --git a/range-diff.h b/range-diff.h
index 2407d46a301e5554bf3a4f855d20cc408b1f89bd..190593f0c78151c99cc6e87161137b99c2615c80 100644 (file)
--- a/range-diff.h
+++ b/range-diff.h
@@ -3,7 +3,10 @@
 
 #include "diff.h"
 
+#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
+
 int show_range_diff(const char *range1, const char *range2,
-                   int creation_factor, struct diff_options *diffopt);
+                   int creation_factor, int dual_color,
+                   struct diff_options *diffopt);
 
 #endif