mergetools / gvimdiffon commit Merge branch 'nd/rebase-show-current-patch' (9ca488c)
   1. "$MERGE_TOOLS_DIR/vimdiff"