summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.6.5.4.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 14:24:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 14:24:52 -0700
commit69490f345943f6f6d7ae52e0e9c870e8b48a5dea (patch)
tree2cb4ba93b2a6f409db00730f46c4fe024b82532e /Documentation/RelNotes/1.6.5.4.txt
parentMerge branch 'maint-1.8.2' into maint-1.8.3 (diff)
parentDocumentation/git-merge.txt: fix formatting of example block (diff)
downloadtgif-69490f345943f6f6d7ae52e0e9c870e8b48a5dea.tar.xz
Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'Documentation/RelNotes/1.6.5.4.txt')
0 files changed, 0 insertions, 0 deletions