mergetools / gvimdiff3on commit Merge branch 'jk/checkout-from-tree' (c21df07)
   1. "$MERGE_TOOLS_DIR/vimdiff"