Andrew's git / gitweb.git / diff
?
Merge branch 'bw/union-merge-refactor'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:34 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:34 +0000 (11:29 -0700)
* bw/union-merge-refactor:
merge-file: add option to select union merge favor
merge-file: add option to specify the marker size
refactor merge flags into xmparam_t
make union merge an xdl merge favor

No differences found