mergetools / gvimdiff2on commit Merge branch 'sb/p5310-and-chain' (64fe6fc)
   1. "$MERGE_TOOLS_DIR/vimdiff"