summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-19 14:50:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-19 14:50:31 -0800
commit6610af872f6494a061780ec738c8713a034b848b (patch)
tree1759bb5f6ab55a038bbf34d334cc2f5e20362b50 /Documentation/git-merge-index.txt
parentMerge branch 'kh/tutorial-grammofix' (diff)
downloadtgif-6610af872f6494a061780ec738c8713a034b848b.tar.xz
Second batch for 2.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions