Currently working custom merge options for WinMerge:
The options I used in Sourcetree 3.4.3 for Windows 64-bit with WinMerge 2.16.10.0 x64 and which worked for merging:
- Options > Diff > External Diff / Merge:
- Merge Tool: Custom
- Merge Command: C:\Program Files\WinMerge\WinMergeU.exe
- Arguments:
-wl -wr -dl Remote -dm Base -dr Local \"$REMOTE\" \"$BASE\" \"$LOCAL\" -o \"$MERGED\"
- Arguments:
반응형
'버전관리' 카테고리의 다른 글
| git push Error : LFS (0) | 2024.02.01 |
|---|---|
| Jump to Commit : Sourcetree Git Commit/Tag/Branch 검색 (0) | 2022.06.09 |
| [Gitlab] Merge Request (0) | 2022.04.27 |
| Previous operation has not finished; run 'cleanup' if it was interrupted 오류 해결방법 (0) | 2021.04.08 |
| TortoiseGit & GitLab & SSH key (0) | 2019.07.12 |