summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 06:13:49 +0200
committerJunio C Hamano <gitster@pobox.com>2018-04-11 06:13:49 +0200
commit26e47e261e969491ad4e3b6c298450c061749c9e (patch)
tree62b94be9d536e988afcc35f480d1729c639812e4 /merge-recursive.c
parentMerge branch 'eb/cred-helper-ignore-sigpipe' (diff)
downloadgit-26e47e261e969491ad4e3b6c298450c061749c9e.tar.xz
git-26e47e261e969491ad4e3b6c298450c061749c9e.zip
The third batch for 2.18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions