mergetools / gvimdiffon commit Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows (90dbf22)
   1. "$MERGE_TOOLS_DIR/vimdiff"