summaryrefslogtreecommitdiffstats
path: root/git-diff-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-25 13:12:55 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-25 13:12:55 -0800
commit2f5a9896b8a0020ce124ca87764bc91f565e48bb (patch)
tree169d2a3dbcd625aef74728e004d2d20157a5bcbd /git-diff-tree.html
parent2267da58fbe3aef887c21a27fd6b056bf6b38fcf (diff)
downloadgit-htmldocs-2f5a9896b8a0020ce124ca87764bc91f565e48bb.tar.gz
Autogenerated HTML docs for v2.25.0-rc0
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r--git-diff-tree.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html
index ec441e0b3..ec7c9480c 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -3381,7 +3381,7 @@ T: change in the type of the file
<li>
<p>
U: file is unmerged (you must complete the merge before it can
-be committed)
+ be committed)
</p>
</li>
<li>