On Wednesday 23 October 2019 13:09:51 CEST Denton Liu wrote: > On Wed, Oct 23, 2019 at 10:15:15AM +0000, Jerome Pouiller wrote: > > On Wednesday 23 October 2019 10:55:03 CEST Denton Liu wrote: > > > I am currently have a WIP patchset that will print the location of the > > > failed patch file (.git/rebase-apply/patch) in the case of a failure as > > > well as the line number. Will this be sufficient for your purposes? > > > > It would be a clear improvement (the perfection would be to be able to > > use mergetool with git-am :) ). > > You should be able to do that with the --3way (-3) flag.
AFAIK, it only works if index is found in local repository, which is rarely the case :( -- Jérôme Pouiller