Merge branch 'mm/apply-double-slash'

* mm/apply-double-slash:
apply: handle filenames with double slashes better

diff --cc builtin-apply.c
Simple merge