Stefan Beller <sbel...@google.com> writes: > $ git status > rebase in progress; onto ... > You are currently rebasing branch '...' on '...'. > > Changes to be committed: > modified: ... > > Unmerged paths: > both modified: ... > > $ git mergetool > No files need merging > $ git diff <file name> > diff --cc <file name> > index ... > --- a/file > +++ b/file > @@@ ... > content > ++<<<<<<< HEAD > + content > ++======= > + content > ++>>>>>>> other commit > content > > > The mergetool used to work apparently, but stopped for rebases. > I noticed in neither t7610-mergetool.sh nor any rebase test the combination of > rebase and mergetool is tested.
The above redacts too much to be useful for guessing, but are you by any chance being hit by a recent regression, i.e. have rerere enabled and running mergetool from a subdirectory? See <20170109232941.43637-15-hans...@google.com> (and previous rounds).
