diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-06 15:41:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-26 14:44:47 -0800 |
| commit | b13112fa160f44fb0d795cdd992015c9f5a3d72a (patch) | |
| tree | dbf92a734807c32342703603ea3d7c77826b95fe | |
| parent | Which merge_file() function do you mean? (diff) | |
| download | tgif-b13112fa160f44fb0d795cdd992015c9f5a3d72a.tar.xz | |
merge-tree: lose unused "flags" from merge_list
Drop the unused field from the structure.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index ebd0d25db6..b61d811158 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -12,8 +12,7 @@ struct merge_list { struct merge_list *next; struct merge_list *link; /* other stages for this object */ - unsigned int stage : 2, - flags : 30; + unsigned int stage : 2; unsigned int mode; const char *path; struct blob *blob; |