diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-26 00:49:53 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-26 09:18:51 -0700 |
| commit | 712516bcacacd45b4825ec649f15c3573f6fb42a (patch) | |
| tree | d167bb0edd73ead266dad5914a2d1d49276cf4f0 /Documentation/merge-strategies.txt | |
| parent | 635a7bb1d807390bedfc1147d2052e8423bcd1e0 (diff) | |
| download | git-712516bcacacd45b4825ec649f15c3573f6fb42a.tar.gz git-712516bcacacd45b4825ec649f15c3573f6fb42a.tar.xz | |
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>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions