mergetools / gvimdiff3on commit Merge branch 'jk/push-simple' (23c0956)
   1. "$MERGE_TOOLS_DIR/vimdiff"