mergetools / vimdiff2on commit Merge branch 'rt/cherry-pick-status' (0e3b378)
   1. "$MERGE_TOOLS_DIR/vimdiff"