summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-10-31 14:13:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-31 14:13:38 -0700
commitafc05f9f13beded8caf15d8e58d06fd64e0f7808 (patch)
treeb9a7b1386a97ca10b99671e4fad3a24f8b5734fc /Documentation/merge-strategies.txt
parentMerge branch 'maint' into HEAD (diff)
parentGIT 1.5.3.5 (diff)
downloadtgif-afc05f9f13beded8caf15d8e58d06fd64e0f7808.tar.xz
Merge branch 'maint' to catch up with 1.5.3.5
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions