mergetools / gvimdiff3on commit Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update (5313bee)
   1. "$MERGE_TOOLS_DIR/vimdiff"