PATCH: [ 1877735 ] Manual: Document third path in command line

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index b72a162..7f97fa9 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -7,6 +7,7 @@ WinMerge 2.7.7.3
   Save line filter when edit box loses focus (#1875853)
   Add link to translations website at help menu (#1699883)
   Manual: Add instructions for conflict file resolving (#1876770)
+  Manual: Document third path given to command line (#1877735)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml
index 519dd9d..bf7d75b 100644 (file)
--- a/Docs/Users/Manual/Command_line.xml
+++ b/Docs/Users/Manual/Command_line.xml
@@ -187,4 +187,15 @@
   <replaceable>rightpath</replaceable>) point to folders or files. It is not
   possible to compare folder to file (except in case described in above note).
   If WinMerge cannot find any of given paths, it opens Open-dialog.</para>
-</sect1>
+
+  <para>Third path given in command line is rarely needed when WinMerge is
+  started from command line. It is meant to be used with many version control
+  tools which use third path as a "<emphasis>result</emphasis>" file. WinMerge
+  always shows two files in file compare, the third path is a path where any
+  of these files gets saved into, leaving other two paths intact.</para>
+
+  <para>Usually these tools use terms like "<emphasis>theirs</emphasis>",
+  "<emphasis>mine</emphasis>" and "<emphasis>merged</emphasis> "/ "
+  <emphasis>resolved</emphasis>" about these three files. And those paths
+  should be given in that order for WinMerge.</para>
+</sect1>
\ No newline at end of file