diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-07 00:41:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-26 23:44:47 +0100 |
| commit | b13112fa160f44fb0d795cdd992015c9f5a3d72a (patch) | |
| tree | dbf92a734807c32342703603ea3d7c77826b95fe /merge-recursive.c | |
| parent | Which merge_file() function do you mean? (diff) | |
| download | git-b13112fa160f44fb0d795cdd992015c9f5a3d72a.tar.xz git-b13112fa160f44fb0d795cdd992015c9f5a3d72a.zip | |
merge-tree: lose unused "flags" from merge_list
Drop the unused field from the structure.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions