Advertisement
Guest User

Untitled

a guest
Mar 1st, 2017
71
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.37 KB | None | 0 0
  1. echo off
  2.  
  3. REM PARAMS: $BASE $LOCAL $REMOTE $MERGED
  4.  
  5. set base=%1
  6. set local=%2
  7. set remote=%3
  8. set merged=%4
  9.  
  10. set nul="nul"
  11.  
  12. set emptyfile="%userprofile%/.empty"
  13.  
  14. set p4mergepath="c:/program files/perforce/p4merge.exe"
  15.  
  16. if "%local%" == "%nul%" (
  17. set local=%emptyfile%
  18. )
  19.  
  20. if "%remote%" == "%nul%" (
  21. set local=%emptyfile%
  22. )
  23.  
  24. call %p4mergepath% %base% %local% %remote% %merged%
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement