summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-13 10:57:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-13 10:57:09 -0700
commit375f8a032e9f47d362afd5ea2443f77bcba685cb (patch)
tree67475aa7192531ee99728dda86ebf1817f6b3636 /Documentation/merge-config.txt
parentMerge branch 'aw/maint-rebase-i-p-no-ff' into maint (diff)
downloadtgif-375f8a032e9f47d362afd5ea2443f77bcba685cb.tar.xz
Prepare for 1.7.5.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions