summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Steven Drake <sdrake@xnet.co.nz>2010-02-26 17:00:21 +1300
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-25 22:47:48 -0800
commita94d305bf8043a7a0579037c7e52e632613410f7 (patch)
treefe5fb24e4e0685344f834cbaf3c7bbc2a008ccd1 /Documentation/merge-options.txt
parentinit: having keywords without value is not a global error. (diff)
downloadtgif-a94d305bf8043a7a0579037c7e52e632613410f7.tar.xz
t/t0001-init.sh: add test for 'init with init.templatedir set'
Requires a small change to wrap-for-bin.sh in order to work. Signed-off-by: Steven Drake <sdrake@xnet.co.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions