mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 14:56:07 +02:00
Code

mergetool: add win32 path translation for diffmerge 

Use the infrastructure added for finding winmerge to also
automatically find DiffMerge,

Signed-off-by: Bert Huijben <bert@vmoo.com>
This commit is contained in:
Bert Huijben 2021-04-29 10:18:17 +02:00
parent b0c09ab879
commit c56521203e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mergetools/diffmerge
View File

@ -16,3 +16,7 @@ merge_cmd () {
exit_code_trustable () {
true
}
translate_merge_tool_path() {
mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge"
}