mergetools / gvimdiff2on commit diffcore-order: export generic ordering interface (1df4320)
   1. "$MERGE_TOOLS_DIR/vimdiff"