Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

* sb/maint-1.6.2-opt-filename-fix:
  apply, fmt-merge-msg: use relative filenames
  commit: -F overrides -t

diff --cc builtin-apply.c
Simple merge

diff --cc builtin-fmt-merge-msg.c
Simple merge

diff --cc t/t6200-fmt-merge-msg.sh
Simple merge