mergetools / gvimdiff2on commit Merge branch 'jk/at-push-sha1' (c4a8354)
   1. "$MERGE_TOOLS_DIR/vimdiff"