diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:34 -0700 |
| commit | 2bb76e139e3ab503992d227103f2bbb806b1f04b (patch) | |
| tree | 3f69bde406db6eeb33f81f8fdd6d64035111a07d /builtin/update-index.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | merge-file: add option to select union merge favor (diff) | |
| download | tgif-2bb76e139e3ab503992d227103f2bbb806b1f04b.tar.xz | |
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 'builtin/update-index.c')
0 files changed, 0 insertions, 0 deletions