repo.or.cz
/
git
/
gitweb.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
remote-hg: check diverged bookmarks
[git/gitweb.git]
/
mergetools
/
tkdiff
blob
618c438e8765a485ffcc70a105fb0cf46010540c
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE"
3
}
4
5
merge_cmd () {
6
if $base_present
7
then
8
"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
9
else
10
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
11
fi
12
}