Last active
March 1, 2017 17:21
-
-
Save garymcleanhall/cbd4d69b0d3201ecf558d68d4455f084 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| echo off | |
| REM PARAMS: $LOCAL $REMOTE | |
| set local=%1 | |
| set remote=%2 | |
| set p4mergepath="c:/program files/perforce/p4merge.exe" | |
| set emptyfile="%userprofile%\.empty" | |
| if "%local%" == "nul" ( | |
| set local=%emptyfile% | |
| ) | |
| if "%remote%" == "nul" ( | |
| set remote=%emptyfile% | |
| ) | |
| call %p4mergepath% %local% %remote% |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment