mergetools / gvimdiff3on commit Merge branch 'rs/c-auto-resets-attributes' (578e602)
   1. "$MERGE_TOOLS_DIR/vimdiff"