projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cd1d61c) | patch
refactor merge flags into xmparam_t
authorBert Wesarg <bert.wesarg@googlemail.com>
Mon, 1 Mar 2010 21:46:26 +0000 (22:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 19:51:48 +0000 (11:51 -0800)
commit560119b9abfa39504c93ed08735426dae947d5a9
tree692dc5dd03e878f9650dfd0cc7c1d8b5c89e340dtree | snapshot
parentcd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676commit | 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>
builtin-merge-file.c diff | blob | history
ll-merge.c diff | blob | history
xdiff/xdiff.h diff | blob | history
xdiff/xmerge.c diff | blob | history
Git—the stupid content tracker