Allow git-merge not to commit.

diff --git a/diff.h b/diff.h
index 7f4079c87104afd8bda23046942121b7d3ff62ee..2f4a7b463b699e65848656279287e2d8e2048c16 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -103,7 +103,7 @@ extern void diff_flush(struct diff_options*);
 /* these are not diff-raw status letters proper, but used by
  * diffcore-filter insn to specify additional restrictions.
  */
-#define DIFF_STATUS_FILTER_AON         'A'
+#define DIFF_STATUS_FILTER_AON         '*'
 #define DIFF_STATUS_FILTER_BROKEN      'B'
 
 #endif /* DIFF_H */