mergetools / gvimdiff2on commit Merge branch 'jk/format-patch-from' (22fcbc4)
   1. "$MERGE_TOOLS_DIR/vimdiff"