mergetools / gvimdiff2on commit Merge branch 'ws/rebase-p' (57e4b1c)
   1. "$MERGE_TOOLS_DIR/vimdiff"