mergetools / bc3on commit t6036: add a failed conflict detection case with submodule add/add (a79968b)
   1. "$MERGE_TOOLS_DIR/bc"