tokkee.org
Code
projects
/
git.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
618c438e8765a485ffcc70a105fb0cf46010540c
[git.git]
/
mergetools
/
tkdiff
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
}