mergetools / bc3on commit merge-recursive: add computation of collisions due to dir rename & merging (ea625cb)
   1. "$MERGE_TOOLS_DIR/bc"