From 03560acf2e5e04a236ba48f9dc2f995d60629072 Mon Sep 17 00:00:00 2001
From: Derek Passen <dpassen1@gmail.com>
Date: Sat, 21 Mar 2026 13:53:58 -0500
Subject: [PATCH] Add jujutsu usage instructions

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 5378a88..ae6db2c 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,15 @@ git config --global mergetool.ec.cmd 'ec "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
 git config --global mergetool.ec.trustExitCode true
 ```
 
+## Jujutsu merge-editor configuration
+
+You can set ec as your jujutsu merge-editor by adding this to your jujutsu config
+
+```
+jj config set --user ui.merge-editor 'ec'
+jj config set --user merge-tools.ec.merge-args '["$base", "$left", "$right", "$output"]'
+```
+
 ## Usage
 
 Interactive