mergetools / gvimdiff2on commit Merge branch 'ds/use-get-be64' (2dc69ee)
   1. "$MERGE_TOOLS_DIR/vimdiff"