summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:29:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:29:50 -0700
commitbca92e88e7d5c95ef6d38d6966f5e7a11969c7d2 (patch)
treef64ff7da9651848e38253bc2de5135dc45186578 /Documentation/merge-options.txt
parentMerge branch 'tb/t0027-crlf' (diff)
downloadtgif-bca92e88e7d5c95ef6d38d6966f5e7a11969c7d2.tar.xz
Sixth batch for 2.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions