summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-20 16:13:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-20 16:13:41 -0700
commit21ff9151e811059f5576ca906c519ee5bb5b925e (patch)
treead3913fb548382f296b6500ba67e1becbb5a63d4 /Documentation/merge-strategies.txt
parentMerge branch 'cm/remote-mediawiki' (diff)
downloadtgif-21ff9151e811059f5576ca906c519ee5bb5b925e.tar.xz
Update draft release notes to 1.8.4
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions