Ilya Grigoriev

I'd like to add basic mergetool support. I think the best that can be done is to use a mergetool for simple conflicts, `A + B - C` in jj...

I now have a working but very unfinished version of this at https://github.com/ilyagr/jj/tree/mergetool. For now, you have to recompile to use a different mergetool than Vim. Also, it doesn't function...

Indeed, I was talking solely about partial conflict resolution. The initial version of my code did exactly what you suggest: it took whatever the merge tool output was, and put...

> One option is to render conflicts as empty strings in the pre-populated output file. I just tried vimdiff to get a better understanding for how it works. It seems...

BTW, I tried out the case of the user messing up the conflict markers you mentioned in https://github.com/martinvonz/jj/issues/18#issuecomment-1296526577. Arguably, that works out OK -- the messed up conflict is considered...

`black` running on 3.9 cannot format code with Python 3.10's pattern matching syntax as discussed in https://github.com/psf/black/issues/2242#issuecomment-1372350750. Is there any change 3.10 is a supported lambda runtime by now?

I found that checking "Skip temporary sanity checks." makes the playground format Python code with match statements. I'm not sure if that formatting is what it's supposed to be, but...

@horriblename If you like, you can add your fork or patch to https://github.com/gokcehan/lf/wiki/Patches-and-community-forks.

According to the docs, the file should be named `~/.config/lf/colors` exactly (and either `C:\Users\\AppData\Local\lf\colors` or `C:\ProgramData\lf\colors` on Windows). There is no `colors` option

No, there is no such option (though I'm guessing based on this issue that it once existed). Colors are always on. Perhaps it would help if you shared the `colors`...