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 /git-gui/.gitattributes | |
| 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>
Diffstat (limited to 'git-gui/.gitattributes')
0 files changed, 0 insertions, 0 deletions