mergetools / gvimdiff3on commit Merge branch 'so/cherry-pick-always-allow-m1' (77fbd96)
   1. "$MERGE_TOOLS_DIR/vimdiff"