mergetools / gvimdiff2on commit Merge branch 'kh/tutorial-grammofix' (f0e0955)
   1. "$MERGE_TOOLS_DIR/vimdiff"