diff --git a/revision.h b/revision.h
index 1c0abf0f58e3559588cd6522210bc9cf76d43f0f..8214a55348d1311dd3325b843ae572930e582078 100644 (file)
--- a/revision.h
+++ b/revision.h
/* Traversal flags */
unsigned int dense:1,
prune:1,
- no_merges:1,
- merges_only:1,
no_walk:1,
show_all:1,
remove_empty_trees:1,
int max_count;
unsigned long max_age;
unsigned long min_age;
+ int min_parents;
+ int max_parents;
/* diff info for patches and for paths limiting */
struct diff_options diffopt;