summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-05 04:05:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-05 04:05:03 (GMT)
commita8d93d19a2fede14a35db163a1fd3bc87b6ac41d (patch)
tree7d7c2bea19b0d8cdc5878ad9875cd68fecbcea14 /rerere.c
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
parentc8dd1e3bb1152844983558802a52c9e4c17652b4 (diff)
downloadgit-a8d93d19a2fede14a35db163a1fd3bc87b6ac41d.zip
git-a8d93d19a2fede14a35db163a1fd3bc87b6ac41d.tar.gz
git-a8d93d19a2fede14a35db163a1fd3bc87b6ac41d.tar.bz2
Merge branch 'maint-2.7' into maint-2.8
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions