changeset 570:2ddde1c793f9

Remove outdated script.
author Oleksandr Gavenko <gavenkoa@gmail.com>
date Thu, 08 May 2014 22:23:58 +0300
parents b49dfaf54da8
children 5ce1dc5f661f
files hg/hgmerge.bat
diffstat 1 files changed, 0 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/hg/hgmerge.bat	Thu May 08 22:21:16 2014 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-@echo off
-REM Copyright (C) 2008 by Oleksandr Gavenko <gavenkoa@gmail.com>
-
-echo Instead using such script by modern Mercurial try set "merge = internal:merge"
-echo under "[ui]" section in .hgrc!
-
-IF "%3"==""     GOTO err_arg_cnt
-IF NOT "%4"=="" GOTO err_arg_cnt
-
-IF NOT EXIST %1 GOTO err_file_not_exist
-IF NOT EXIST %2 GOTO err_file_not_exist
-IF NOT EXIST %3 GOTO err_file_not_exist
-
-SET my=%1
-SET orig=%2
-SET your=%3
-SET merged=%my%.hgmerge
-
-IF EXIST %merged% (del /q %merged%)
-diff3 -L my -L orig -L your -E -m %my% %orig% %your% > %merged%
-
-IF ERRORLEVEL 1 (
-    echo C %my%
-    move /y %merged% %my%
-    EXIT 1
-) ELSE (
-    echo M %my%
-    move /y %merged% %my%
-)
-EXIT 0
-
-:err_arg_cnt
-  echo Wrong arg count!
-  echo You run:
-  echo ^> %0 %*
-  echo Must:
-  echo ^> %0 my orig your
-EXIT 1
-
-:err_file_not_exist
-  echo One of '%*' files not exist.
-EXIT 1