| commit | b9170780f19ed984d2f9edf4ce6c06932cbb5da6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Mar 2010 22:16:12 +0000 (10 14:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Mar 2010 22:16:12 +0000 (10 14:16 -0800) | ||
| tree | 31ca8259ef321a1e321545865701e26c1b5a23b0 | treesnapshot (tar.gz zip) |
| parent | 015ef4b25a6c64501b773b163a92ac230d8de32d | commitdiff |
| parent | 3a15048d833e2d6599091a9f7c14b0fa926c3bbf | commitdiff |
Merge branch 'bw/union-merge-refactor' into next
* bw/union-merge-refactor:
merge-file: add option to select union merge favor
merge-file: add option to specify the marker size
* bw/union-merge-refactor:
merge-file: add option to select union merge favor
merge-file: add option to specify the marker size
| builtin/merge-file.c | diff1 | diff2 | blobhistory |
| t/t6023-merge-file.sh | diff1 | diff2 | blobhistory |