Skip to content

Commit a56d29e

Browse files
committed
Add jujutsu usage instructions
1 parent 6860fb8 commit a56d29e

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,15 @@ git config --global mergetool.ec.cmd 'ec "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
135135
git config --global mergetool.ec.trustExitCode true
136136
```
137137

138+
## Jujutsu merge-editor configuration
139+
140+
You can set ec as your jujutsu merge-editor by adding this to your jujutsu config
141+
142+
```
143+
jj config set --user ui.merge-editor "ec"
144+
jj config set --user merge-tools.ec.merge-args "['\$base', '\$left', '\$right', '\$output']"
145+
```
146+
138147
## Usage
139148

140149
Interactive

0 commit comments

Comments
 (0)