mergetools / bc3on commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1. "$MERGE_TOOLS_DIR/bc"