mergetools / gvimdiff2on commit Merge branch 'bw/object-id' (a6f38c1)
   1. "$MERGE_TOOLS_DIR/vimdiff"