home: jujutsu: set 'ui.merge-editor'
Same reason as `ui.diff-editor`.
This commit is contained in:
parent
7e2da79de3
commit
ef525a09ca
1 changed files with 2 additions and 0 deletions
|
|
@ -45,6 +45,8 @@ in
|
||||||
diff-editor = ":builtin";
|
diff-editor = ":builtin";
|
||||||
# I don't like word-diff
|
# I don't like word-diff
|
||||||
diff-formatter = ":git";
|
diff-formatter = ":git";
|
||||||
|
# Stop nagging me about it, though I am not a fan of its UI.
|
||||||
|
merge-editor = ":builtin";
|
||||||
# Does not honor `$PAGER` (anymore)
|
# Does not honor `$PAGER` (anymore)
|
||||||
pager = lib.mkDefault config.home.sessionVariables.PAGER;
|
pager = lib.mkDefault config.home.sessionVariables.PAGER;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue