summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-01 12:47:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-01 12:47:56 -0700
commitf86f31ab33c3406adebbb9f9f61be550dcc5a472 (patch)
tree2d6f17582c301f3c19f64afbe70b629fcc68505b /Documentation/merge-options.txt
parentMerge branch 'sb/test-bitmap-free-at-end' (diff)
downloadtgif-f86f31ab33c3406adebbb9f9f61be550dcc5a472.tar.xz
Sixth batch for 2.5 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions