diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-03-01 22:46:27 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 21:16:44 -0800 |
| commit | 11f3aa2305426d11945c72479d24a15d30768d50 (patch) | |
| tree | a387ab1883e3e0f007ab306217972dde4306f98f /t/t4253-am-keep-cr-dos.sh | |
| parent | refactor merge flags into xmparam_t (diff) | |
| download | tgif-11f3aa2305426d11945c72479d24a15d30768d50.tar.xz | |
merge-file: add option to specify the marker size
This adds the abbility to specify the conflict marker size for merges outside
a git repository.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4253-am-keep-cr-dos.sh')
0 files changed, 0 insertions, 0 deletions