mergetools / bc3on commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1. "$MERGE_TOOLS_DIR/bc"