mergetools / bc3on commit Merge branch 'master' of git://ozlabs.org/~paulus/gitk (257000c)
   1. "$MERGE_TOOLS_DIR/bc"