mergetools / gvimdiff3on commit Merge branch 'tb/config-core-filemode-check-on-broken-fs' (168ab99)
   1. "$MERGE_TOOLS_DIR/vimdiff"