DeveloperGuidelines/Git: merge.cmd

File merge.cmd, 186 bytes (added by Fran Boon, 10 years ago)

Windows script to help with merge conflicts

Line 
1@echo off
2rem Read Arguments
3IF dummy==dummy%1 (
4echo Need an Argument
5) ELSE (
6rem del /F %1
7set LANG=en_US.UTF-8
8call git show :2:%1 > %1.THIS
9call git show :3:%1 > %1.OTHER
10)