mergetools / bc3on commit mergetool: honor diff.orderFile (57937f7)
   1. "$MERGE_TOOLS_DIR/bc"