Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 539bd2f5ce98b779885b9a3fdc2e838b5b293d6b..9a0169c03ceb82b5cc2c246fa9f70e2f8399ec33 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -101,9 +101,6 @@ extern int diff_setup_done(struct diff_options *);
 
 #define DIFF_PICKAXE_ALL       1
 
-#define DIFF_DEFAULT_INDEX_ABBREV      7 /* hex digits */
-#define DIFF_DEFAULT_ABBREV    7 /* hex digits */
-
 extern void diffcore_std(struct diff_options *);
 
 extern void diffcore_std_no_resolve(struct diff_options *);