summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:32:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:32:59 -0700
commita75f9f053d459fb35a52fd223677812099fa6476 (patch)
tree510589c2b8f52a684c55e3198d966de39dc04b3b /Documentation/merge-options.txt
parentMerge branch 'jk/add-i-custom-diff-algo' (diff)
downloadtgif-a75f9f053d459fb35a52fd223677812099fa6476.tar.xz
Update draft release notes to 1.8.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions