nix-community / home-manager

Manage a user environment using Nix [maintainer=@rycee]
https://nix-community.github.io/home-manager/
MIT License
6.1k stars 1.65k forks source link

jujutsu: add ediff option #5371

Closed bbigras closed 3 weeks ago

bbigras commented 4 weeks ago

based on https://github.com/martinvonz/jj/wiki/Emacs#ediff-as-a-merge-tool

Description

Checklist

Maintainer CC

@shikanime

bbigras commented 3 weeks ago

@rycee thank you very much for the suggestions. It does seem to work.

rycee commented 3 weeks ago

Looks good. Merged to master now 🙂

bbigras commented 3 weeks ago

Thanks!