repo.or.cz
/
git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
merge-ort/merge-recursive: do report errors in `merge_submodule()`
[git.git]
/
mergetools
/
diffuse
blob
ebfaba517216d85429a539177128f20719f538c7
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3
}
4
5
diff_cmd_help () {
6
echo "Use Diffuse (requires a graphical session)"
7
}
8
9
merge_cmd () {
10
if $base_present
11
then
12
"$merge_tool_path" \
13
"$LOCAL" "$MERGED" "$REMOTE" \
14
"$BASE" | cat
15
else
16
"$merge_tool_path" \
17
"$LOCAL" "$MERGED" "$REMOTE" | cat
18
fi
19
}
20
21
merge_cmd_help () {
22
echo "Use Diffuse (requires a graphical session)"
23
}