mergetools / gvimdiff2on commit Merge branch 'nd/status-show-in-progress' (55f9c83)
   1. "$MERGE_TOOLS_DIR/vimdiff"