repo.or.cz
/
git
/
raj.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
git-cvsexportcommit: port to SHA-256
[git/raj.git]
/
mergetools
/
bc
blob
3a69e60faa9c95dcf388cd295d040e9b88e0defd
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE"
3
}
4
5
merge_cmd () {
6
if $base_present
7
then
8
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
9
-mergeoutput="$MERGED"
10
else
11
"$merge_tool_path" "$LOCAL" "$REMOTE" \
12
-mergeoutput="$MERGED"
13
fi
14
}
15
16
translate_merge_tool_path() {
17
if type bcomp >/dev/null 2>/dev/null
18
then
19
echo bcomp
20
else
21
echo bcompare
22
fi
23
}