2007. 6. 28. 15:09
TortoiseSVN with Araxis Merge
2007. 6. 28. 15:09 in Utilities
The External Programs section of the TortoiseSVN Settings window enables external diff and merging programs to be configured.
To configure Merge as the Diff Viewer:
- In the TortoiseSVN Settings window, select the Diff Viewer page (located under External Programs).
- Select the External radio button.
In path field, enter the following (all on one line):
"C:Program FilesAraxisAraxis Mergecompare.exe" /max /wait /title1:%bname /title2:%yname %base %mine
Note: in the above path, replace C:Program FilesAraxisAraxis Merge with the full path of the Merge installation directory on your machine.
To configure Merge as the Merge Tool:
- In the TortoiseSVN Settings window, select the Merge Tool page (located under External Programs).
- Select the External radio button.
In path field, enter the following (all on one line):
"C:Program FilesAraxisAraxis Mergecompare.exe" /max /wait /3 /title1:%tname /title2:%bname /title3:%yname %theirs %base %mine %merged /a2
Note: in the above path, replace C:Program FilesAraxisAraxis Merge with the full path of the Merge installation directory on your machine.
'Utilities' 카테고리의 다른 글
[링크스크랩] 토렌토 파일검색 사이트 모음입니다. (0) | 2007.10.19 |
---|---|
GDB를 이용한 디버깅 (0) | 2007.10.04 |
Torrento 사용법 (1) | 2007.06.22 |
[본문스크랩] Doxygen 사용법 (0) | 2007.06.22 |
[본문스크랩] FTP Command (0) | 2007.06.20 |