From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Mar 2010 18:29:34 +0000 (-0700)
Subject: Merge branch 'bw/union-merge-refactor'
X-Git-Tag: v1.7.1-rc0~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bb76e139e3ab503992d227103f2bbb806b1f04b;p=git.git

Merge branch 'bw/union-merge-refactor'

* 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
---

2bb76e139e3ab503992d227103f2bbb806b1f04b