home: jujutsu: set 'ui.merge-editor'
Same reason as `ui.diff-editor`.
This commit is contained in:
parent
50f95ce1e1
commit
a008c9b73b
1 changed files with 2 additions and 0 deletions
|
|
@ -43,6 +43,8 @@ in
|
||||||
ui = {
|
ui = {
|
||||||
# Stop nagging me about it, though I am not a fan of its UI.
|
# Stop nagging me about it, though I am not a fan of its UI.
|
||||||
diff-editor = ":builtin";
|
diff-editor = ":builtin";
|
||||||
|
# Stop nagging me about it, though I am not a fan of its UI.
|
||||||
|
merge-editor = ":builtin";
|
||||||
};
|
};
|
||||||
|
|
||||||
templates = {
|
templates = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue