mergetools / gvimdiffon commit Merge branch 'jk/gettext-poison' (ac0a57c)
   1. "$MERGE_TOOLS_DIR/vimdiff"