summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:48:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:48:54 -0700
commitebeea528709abf5ee0a0f3e8ad706f7bacc36c05 (patch)
tree34b392270824a5263a1a45a5e2009a6d91578b18 /Documentation/merge-options.txt
parentUpdate draft release notes to 1.8.4 (diff)
parentStart preparing for 1.8.3.2 (diff)
downloadtgif-ebeea528709abf5ee0a0f3e8ad706f7bacc36c05.tar.xz
Merge branch 'maint'
* maint: Start preparing for 1.8.3.2
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions