From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 26 Aug 2010 05:49:53 +0000 (-0500)
Subject: ll-merge: replace flag argument with options struct
X-Git-Tag: v1.7.4-rc0~168^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/712516bcacacd45b4825ec649f15c3573f6fb42a?hp=712516bcacacd45b4825ec649f15c3573f6fb42a

ll-merge: replace flag argument with options struct

Keeping track of the flag bits is proving more trouble than it's
worth.  Instead, use a pointer to an options struct like most similar
APIs do.

Callers with no special requests can pass NULL to request the default
options.

Cc: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: Avery Pennarun <apenwarr@gmail.com>
Helped-by: Justin Frankel <justin@cockos.com>
Helped-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---