mergetools / gvimdiff2on commit Merge branch 'jk/commit-C-pick-empty' (e88155d)
   1. "$MERGE_TOOLS_DIR/vimdiff"