projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 560119b) | patch
merge-file: add option to specify the marker size
authorBert Wesarg <bert.wesarg@googlemail.com>
Mon, 1 Mar 2010 21:46:27 +0000 (22:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 05:16:44 +0000 (21:16 -0800)
commit11f3aa2305426d11945c72479d24a15d30768d50
treea387ab1883e3e0f007ab306217972dde4306f98ftree | snapshot
parent560119b9abfa39504c93ed08735426dae947d5a9commit | diff
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>
Documentation/git-merge-file.txt diff | blob | history
builtin-merge-file.c diff | blob | history
t/t6023-merge-file.sh diff | blob | history
Git—the stupid content tracker