mergetools / vimdiff3on commit Merge branch 'jk/empty-pick-fix' (d94cecf)
   1. "$MERGE_TOOLS_DIR/vimdiff"