mergetools / gvimdiff2on commit i18n: advice: internationalize message for conflicts (8785c42)
   1. "$MERGE_TOOLS_DIR/vimdiff"