repo.or.cz
/
alt-git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
fast-import: convert internal structs to struct object_id
[alt-git.git]
/
mergetools
/
diffuse
blob
5a3ae8b5695d3141ff0310a706495ea52037b464
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3
}
4
5
merge_cmd () {
6
if $base_present
7
then
8
"$merge_tool_path" \
9
"$LOCAL" "$MERGED" "$REMOTE" \
10
"$BASE" | cat
11
else
12
"$merge_tool_path" \
13
"$LOCAL" "$MERGED" "$REMOTE" | cat
14
fi
15
}