mergetools / gvimdiff3on commit Merge branch 'js/rebase-am' (e52c6bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"