f4609b896f
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
28 lines
413 B
Text
28 lines
413 B
Text
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
|
|
}
|
|
|
|
list_tool_variants () {
|
|
echo bc
|
|
echo bc3
|
|
}
|