summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-09 13:06:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-09 13:06:26 -0700
commit0c72b98f31bf6eabd75be565a08ffcf0d8e74b1f (patch)
tree88f7d2e612190064aa4d6e4df5f627baa01f4d08 /Documentation/merge-strategies.txt
parentMerge branch 'sp/pack-protocol-doc-on-shallow' (diff)
downloadtgif-0c72b98f31bf6eabd75be565a08ffcf0d8e74b1f.tar.xz
Update draft release notes to 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions