diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-03-02 00:46:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 22:51:48 +0300 |
| commit | 560119b9abfa39504c93ed08735426dae947d5a9 (patch) | |
| tree | 692dc5dd03e878f9650dfd0cc7c1d8b5c89e340d /Documentation/git-merge-file.txt | |
| parent | cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676 (diff) | |
refactor merge flags into xmparam_t
Include the merge level, favor, and style flags into the xmparam_t struct.
This removes the bit twiddling with these three values into the one flags
parameter.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions