mergetools / gvimdiff2on commit Merge branch 'jk/push-client-deadlock-fix' (d689301)
   1. "$MERGE_TOOLS_DIR/vimdiff"