development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-tree: lose unused "flags" from merge_list

Browse source 
Drop the unused field from the structure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-12-06 15:41:04 -08:00
parent fa2364ec34
commit b13112fa16
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builtin/merge-tree.c
View file

@ -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;