diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-03-01 22:46:28 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 21:16:45 -0800 |
| commit | 3a15048d833e2d6599091a9f7c14b0fa926c3bbf (patch) | |
| tree | e86addd828c1c6486573adfda5fea9083681e391 /t/t7500/add-comments | |
| parent | merge-file: add option to specify the marker size (diff) | |
| download | tgif-3a15048d833e2d6599091a9f7c14b0fa926c3bbf.tar.xz | |
merge-file: add option to select union merge favor
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7500/add-comments')
0 files changed, 0 insertions, 0 deletions