git-reset to remove "$GIT_DIR/MERGE_MSG"

diff --git a/diff.h b/diff.h
index ac7b21c46bdf958df5d7c8162c7aa248af54dbdb..101b2b505dcace41754687a427ad0523daaa50a0 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -46,6 +46,7 @@ struct diff_options {
        const char *filter;
        const char *orderfile;
        const char *pickaxe;
+       const char *single_follow;
        unsigned recursive:1,
                 tree_in_recursive:1,
                 binary:1,