mergetools / gvimdiff3on commit Merge branch 'cb/rebase-am-exit-code' (8413a79)
   1. "$MERGE_TOOLS_DIR/vimdiff"