mergetools / gvimdiff3on commit Merge branch 'ag/p3400-force-checkout' (0466aeb)
   1. "$MERGE_TOOLS_DIR/vimdiff"