--- a/tests/test-help.t Wed Aug 15 22:24:50 2018 +0900
+++ b/tests/test-help.t Tue Aug 14 22:20:28 2018 +0900
@@ -1829,18 +1829,26 @@
This implies premerge. Therefore, files aren't dumped, if premerge runs
successfully. Use :forcedump to forcibly write files out.
+ (actual capabilities: binary, symlink)
+
":fail"
Rather than attempting to merge files that were modified on both
branches, it marks them as unresolved. The resolve command must be used
to resolve these conflicts.
+ (actual capabilities: binary, symlink)
+
":forcedump"
Creates three versions of the files as same as :dump, but omits
premerge.
+ (actual capabilities: binary, symlink)
+
":local"
Uses the local 'p1()' version of files as the merged version.
+ (actual capabilities: binary, symlink)
+
":merge"
Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in the
@@ -1864,10 +1872,14 @@
":other"
Uses the other 'p2()' version of files as the merged version.
+ (actual capabilities: binary, symlink)
+
":prompt"
Asks the user which of the local 'p1()' or the other 'p2()' version to
keep as the merged version.
+ (actual capabilities: binary, symlink)
+
":tagmerge"
Uses the internal tag merge algorithm (experimental).
@@ -1877,7 +1889,8 @@
markers are inserted.
Internal tools are always available and do not require a GUI but will by
- default not handle symlinks or binary files.
+ default not handle symlinks or binary files. See next section for detail
+ about "actual capabilities" described above.
Choosing a merge tool
=====================