summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index 93aa012f51..17698cb51a 100644
--- a/revision.h
+++ b/revision.h
@@ -193,10 +193,10 @@ struct rev_info {
/* Diff-merge flags */
explicit_diff_merges: 1,
merges_need_diff: 1,
+ merges_imply_patch:1,
separate_merges: 1,
combine_merges:1,
combined_all_paths:1,
- combined_imply_patch:1,
dense_combined_merges:1,
first_parent_merges:1;