Initial Windows agent repository
This commit is contained in:
commit
a0db0c2e5b
10589 changed files with 3844063 additions and 0 deletions
23
OGP64/usr/libexec/git-core/mergetools/winmerge
Normal file
23
OGP64/usr/libexec/git-core/mergetools/winmerge
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
diff_cmd () {
|
||||
"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
|
||||
return 0
|
||||
}
|
||||
|
||||
diff_cmd_help () {
|
||||
echo "Use WinMerge (requires a graphical session)"
|
||||
}
|
||||
|
||||
merge_cmd () {
|
||||
# mergetool.winmerge.trustExitCode is implicitly false.
|
||||
# touch $BACKUP so that we can check_unchanged.
|
||||
"$merge_tool_path" -u -e -dl Local -dr Remote \
|
||||
"$LOCAL" "$REMOTE" "$MERGED"
|
||||
}
|
||||
|
||||
translate_merge_tool_path() {
|
||||
mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
|
||||
}
|
||||
|
||||
merge_cmd_help () {
|
||||
echo "Use WinMerge (requires a graphical session)"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue