diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:47:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:47:56 -0700 |
commit | f86f31ab33c3406adebbb9f9f61be550dcc5a472 (patch) | |
tree | 2d6f17582c301f3c19f64afbe70b629fcc68505b /Documentation/merge-options.txt | |
parent | Merge branch 'sb/test-bitmap-free-at-end' (diff) | |
download | tgif-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