merge script: tweak unmerged files message to match builtin

diff --git a/revision.h b/revision.h
index bafa72808342919485cc0590a66ffc5ef5c96c82..36fdf22b299c4cc7e6f20d767d5c6a6c3f69d952 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -67,6 +67,7 @@ struct rev_info {
                        reverse_output_stage:1,
                        cherry_pick:1,
                        bisect:1,
+                       ancestry_path:1,
                        first_parent_only:1;
 
        /* Diff flags */