mergetools / gvimdiffon commit Merge branch 'js/fsck-name-object' (9db3979)
   1. "$MERGE_TOOLS_DIR/vimdiff"