mergetools / gvimdiffon commit Merge branch 'jk/push-client-deadlock-fix' into HEAD (c555e52)
   1. "$MERGE_TOOLS_DIR/vimdiff"