mergetools / gvimdiff2on commit git-rebase.txt: update to reflect merge now implemented on sequencer (29d03f8)
   1. "$MERGE_TOOLS_DIR/vimdiff"