summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-05 12:49:00 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-05 12:50:38 +0900
commitac33201285cce4b392c3cedfaf7f098fdb1dde87 (patch)
treeadada97e9d6e84f9b3ad82bcc1bca6eb0dbc3a7b /merge-recursive.h
parent531788af951cbaf5356363f66c54594b555bdde3 (diff)
downloadgit-ac33201285cce4b392c3cedfaf7f098fdb1dde87.tar.gz
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions