Search:
Login
Preferences
Help/Guide
About Trac
Register
Forgot your password?
Wiki
Timeline
Roadmap
Search
Context Navigation
Back to DeveloperGuidelines/Git
DeveloperGuidelines/Git
: merge.cmd
File merge.cmd,
186 bytes
(added by
Fran Boon
,
13 years ago
)
Windows script to help with merge conflicts
Line
1
@echo off
2
rem Read Arguments
3
IF dummy==dummy%1 (
4
echo Need an Argument
5
) ELSE (
6
rem del /F %1
7
set LANG=en_US.UTF-8
8
call git show :2:%1 > %1.THIS
9
call git show :3:%1 > %1.OTHER
10
)
Download in other formats:
Original Format