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
completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
[git.git]
/
mergetools
/
tkdiff
blob
eee5cb57e3ccf7f1ad7ad150c37a8b6d7ab6d436
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
}
13
14
exit_code_trustable () {
15
true
16
}