this diff is too large to be displayed

[rickysarraf]

Having seen the mention of git-crecord, I tried it out.

When running, I get the following error:

$ git merge foo bar
$ \#There are some merge conflicts at this stage.
$ git crecord -vvv
abort: this diff is too large to be displayed

My version of crecord is from Debian:

ii  git-crecord                                   20220324.0-1                                 all          interactively select chunks to commit with Git

numpadlines is reported: 189464
xscreensize is reported: 194

[andrewshadura]

Yeah, trees with merge conflicts aren’t supported, at least not at the moment. I guess I should detect them and fail early.

[andrewshadura]

By the way, it would be great if you could provide a reproducer 🙂