mergetools / gvimdiffon commit Merge branch 'ss/pull-rebase-preserve' (3a18352)
   1. "$MERGE_TOOLS_DIR/vimdiff"