mergetools / gvimdiffon commit Merge branch 'jn/hooks-pre-rebase-sample-fix' (1115749)
   1. "$MERGE_TOOLS_DIR/vimdiff"