[PATCH] faq addition for diff3 exitcode 2 on Windows

Add a workaround for diff3 exitcode 2 error on Windows in the Trouble
shooting section

Index: project_faq.html
===================================================================
--- project_faq.html (revision 4561)
+++ project_faq.html (working copy)
@@ -48,6 +48,7 @@
 p
 strongTroubleshooting:/strong
 /p
+lia href=#diff3-diffI get exitcode 2 from diff3 on Windows/a/li
 lia href=#wedged-reposWhat the heck! Every time I try to access
     my repository, the process just hangs. Is my repository
     corrupt?/a/li
@@ -590,6 +591,22 @@

 ![CDATA[-----------------------------------------------------------]]

+h3I get exitcode 2 from diff3 on Windows a name=diff3-diff/a/h3
+
+p
+This happens when you diff utilities are not installed on the C: drive.
br
+For example: br
+your diff utilities are in D:/cygwin/bin. The work around is:
+/p
+pre
+mkdir -p C:/cygwin/bin
+cp D:/cygwin/bin/diff*.exe C:/cygwin/bin
+/pre
+p
+Despite the Registry and/or the config file showing the D: drive,
+when diff3.exe tries to launch diff.exe the drive letter is ignored, and C:
(the system drive) is used.
+/p
+
 h3What the heck! Every time I try to access my repository, the
 process just hangs. Is my repository a
name=wedged-reposcorrupt?/a/h3

Roger Talkov

rtalkov@appworx.com
425-644-2121 x135

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org