mergetools / gvimdiff2on commit Merge branch 'nd/commit-editor-cleanup' (46c0f91)
   1. "$MERGE_TOOLS_DIR/vimdiff"