--- a/tests/test-help.t Fri Jan 13 00:07:07 2023 +0100
+++ b/tests/test-help.t Thu Jan 26 00:23:07 2023 +0100
@@ -2172,8 +2172,11 @@
":union"
Uses the internal non-interactive simple merge algorithm for merging
- files. It will use both left and right sides for conflict regions. No
- markers are inserted.
+ files. It will use both local and other sides for conflict regions by
+ adding local on top of other. No markers are inserted.
+
+ ":union-other-first"
+ Like :union, but add other on top of local.
Internal tools are always available and do not require a GUI but will by
default not handle symlinks or binary files. See next section for detail