summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:58:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:58:11 -0700
commit6a6636270fbaf74609cd3e1bd207dd2c420d640a (patch)
treed6c115d0d37d3be903f155c57416819ee16d40bd /Documentation/git-merge-file.txt
parentMerge branch 'jv/merge-nothing-into-void' into maint (diff)
downloadtgif-6a6636270fbaf74609cd3e1bd207dd2c420d640a.tar.xz
Prepare for 2.8.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions