Initial Windows agent repository
This commit is contained in:
commit
a0db0c2e5b
10589 changed files with 3844063 additions and 0 deletions
19
OGP64/usr/libexec/git-core/mergetools/kompare
Normal file
19
OGP64/usr/libexec/git-core/mergetools/kompare
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
can_merge () {
|
||||
return 1
|
||||
}
|
||||
|
||||
diff_cmd_help () {
|
||||
echo "Use Kompare (requires a graphical session)"
|
||||
}
|
||||
|
||||
diff_cmd () {
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||||
}
|
||||
|
||||
merge_cmd_help () {
|
||||
echo "Use Kompare (requires a graphical session)"
|
||||
}
|
||||
|
||||
exit_code_trustable () {
|
||||
true
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue