mergetools / gvimdiff3on commit Merge branch 'pk/rebase-in-c-2-basic' (e0720a3)
   1. "$MERGE_TOOLS_DIR/vimdiff"