mergetools / bc3on commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1. "$MERGE_TOOLS_DIR/bc"