mergetools / gvimdiff2on commit Merge branch 'cc/untracked' (77a24b7)
   1. "$MERGE_TOOLS_DIR/vimdiff"