summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-14 10:50:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-14 10:50:02 -0700
commit63434da0b4966894b5b812965cb3ada3d4101d6c (patch)
treef4d1ce4ad41321ae7d9bbfd5544e76368e8f493f /Documentation/git-merge.txt
parentMerge branch 'rs/sha1-array-test' (diff)
parentmailsplit: remove unnecessary unlink(2) call (diff)
downloadtgif-63434da0b4966894b5b812965cb3ada3d4101d6c.tar.xz
Merge branch 'rs/mailsplit'
* rs/mailsplit: mailsplit: remove unnecessary unlink(2) call
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions