SETLOCAL SET PATH=C:\Windows;C:\Windows\system32;C:\Program Files\VisualSVN Server\bin;
set REPOS=%1 set TXN=%2 svnlook diff %REPOS% -t %TXN% > D:\Repositories\vsvn\hooks\hi.txt FINDSTR /I /M /L "<<<<<<<" D:\Repositories\vsvn\hooks\hi.txt if %errorlevel% gtr 0 ( exit 0 ) else ( echo Your commit has been blocked because file contains the conflict markers, Please double-check your diff and try . 1>&2 exit 1 ) -- You received this message because you are subscribed to the Google Groups "VisualSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to visualsvn+unsubscr...@googlegroups.com. To post to this group, send email to visualsvn@googlegroups.com. Visit this group at http://groups.google.com/group/visualsvn. For more options, visit https://groups.google.com/d/optout.
SETLOCAL SET PATH=C:\Windows;C:\Windows\system32;C:\Program Files\VisualSVN Server\bin; set REPOS=%1 set TXN=%2 svnlook diff %REPOS% -t %TXN% > D:\Repositories\vsvn\hooks\hi.txt FINDSTR /I /M /L "<<<<<<<" D:\Repositories\vsvn\hooks\hi.txt if %errorlevel% gtr 0 ( exit 0 ) else ( echo Your commit has been blocked because file contains the conflict markers, Please double-check your diff and try . 1>&2 exit 1 )