mergetools / gvimdiff3on commit Merge branch 'en/incl-forward-decl' (5ade034)
   1. "$MERGE_TOOLS_DIR/vimdiff"