summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-04 07:26:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-04 07:26:46 (GMT)
commit9f3e2fe9f4176b5f0eb14e26b34d21f4dffcebd2 (patch)
tree31737381eada0bf191ab636382cd71f966daed19 /merge-recursive.c
parent741eaf7333e337a3098a1135fb05f1889c3183de (diff)
parent01e60a9a22fea0d10fe869b36d406b2eac131476 (diff)
downloadgit-9f3e2fe9f4176b5f0eb14e26b34d21f4dffcebd2.zip
git-9f3e2fe9f4176b5f0eb14e26b34d21f4dffcebd2.tar.gz
git-9f3e2fe9f4176b5f0eb14e26b34d21f4dffcebd2.tar.bz2
Merge branch 'rg/doc-submittingpatches-wordfix'
* rg/doc-submittingpatches-wordfix: doc: update SubmittingPatches
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions