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

Merge c56521203e into e326e52010

This commit is contained in:
Bert Huijben 2024-04-25 23:52:28 +00:00 committed by GitHub
parent e326e52010 c56521203e
commit 39b72c093e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

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