merge-recursive: separate out xdl_merge() interface.

diff --git a/revision.h b/revision.h
index 5f3f628a9b1ec278dddc1d894066ab1278f6e473..8a026184287479272ececf5cf3d5000c52007553 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -47,6 +47,7 @@ struct rev_info {
                        left_right:1,
                        parents:1,
                        reverse:1,
+                       cherry_pick:1,
                        first_parent_only:1;
 
        /* Diff flags */