Initial class construction
This commit is contained in:
18
Git/mingw64/libexec/git-core/mergetools/guiffy
Normal file
18
Git/mingw64/libexec/git-core/mergetools/guiffy
Normal file
@ -0,0 +1,18 @@
|
||||
diff_cmd () {
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||||
}
|
||||
|
||||
merge_cmd () {
|
||||
if $base_present
|
||||
then
|
||||
"$merge_tool_path" -s "$LOCAL" \
|
||||
"$REMOTE" "$BASE" "$MERGED"
|
||||
else
|
||||
"$merge_tool_path" -m "$LOCAL" \
|
||||
"$REMOTE" "$MERGED"
|
||||
fi
|
||||
}
|
||||
|
||||
exit_code_trustable () {
|
||||
true
|
||||
}
|
Reference in New Issue
Block a user