diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-20 18:29:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 18:29:34 (GMT) |
| commit | 2bb76e139e3ab503992d227103f2bbb806b1f04b (patch) | |
| tree | 3f69bde406db6eeb33f81f8fdd6d64035111a07d /commit.h | |
| parent | 96203bb074544a37fcff9c3f2a68582b76caa263 (diff) | |
| parent | 3a15048d833e2d6599091a9f7c14b0fa926c3bbf (diff) | |
| download | git-2bb76e139e3ab503992d227103f2bbb806b1f04b.zip git-2bb76e139e3ab503992d227103f2bbb806b1f04b.tar.gz git-2bb76e139e3ab503992d227103f2bbb806b1f04b.tar.bz2 | |
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
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions