From dd15b9cf77ea32458c1548364e4cb523a4a34e12 Mon Sep 17 00:00:00 2001
From: rycee <rycee@users.noreply.github.com>
Date: Tue, 7 May 2024 10:25:45 +0000
Subject: [PATCH] deploy: 6e277d9566de9976f47228dd8c580b97488734d4

---
 options.xhtml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/options.xhtml b/options.xhtml
index f44f3750..55faa64c 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -27020,6 +27020,30 @@ package</p>
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">pkgs.jujutsu</code></p>
 
+<p><span class="emphasis"><em>Declared by:</em></span></p>
+<table border="0" summary="Simple list" class="simplelist">
+<tr><td>
+<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/programs/jujutsu.nix" target="_top">
+&lt;home-manager/modules/programs/jujutsu.nix&gt;
+</a></code>
+</td></tr>
+</table>
+</dd>
+<dt>
+ <span class="term">
+ <a id="opt-programs.jujutsu.ediff"></a><a class="term" href="options.xhtml#opt-programs.jujutsu.ediff"><code class="option">programs.jujutsu.ediff</code>
+  </a>
+ </span>
+</dt>
+<dd>
+<p>Enable ediff as a merge tool</p>
+
+<p><span class="emphasis"><em>Type:</em></span>
+boolean</p>
+
+<p><span class="emphasis"><em>Default:</em></span>
+<code class="literal">config.programs.emacs.enable</code></p>
+
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
 <tr><td>