Initial class construction
This commit is contained in:
23
Git/mingw64/libexec/git-core/mergetools/bc
Normal file
23
Git/mingw64/libexec/git-core/mergetools/bc
Normal file
@ -0,0 +1,23 @@
|
||||
diff_cmd () {
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||||
}
|
||||
|
||||
merge_cmd () {
|
||||
if $base_present
|
||||
then
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
|
||||
-mergeoutput="$MERGED"
|
||||
else
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||||
-mergeoutput="$MERGED"
|
||||
fi
|
||||
}
|
||||
|
||||
translate_merge_tool_path() {
|
||||
if type bcomp >/dev/null 2>/dev/null
|
||||
then
|
||||
echo bcomp
|
||||
else
|
||||
echo bcompare
|
||||
fi
|
||||
}
|
Reference in New Issue
Block a user