projects
/
git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
blame
|
history
|
raw
|
HEAD
Merge branch 'rs/t4062-obsd' into maint
[git]
/
mergetools
/
opendiff
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" "$LOCAL" "$REMOTE" \
9
-ancestor "$BASE" -merge "$MERGED" | cat
10
else
11
"$merge_tool_path" "$LOCAL" "$REMOTE" \
12
-merge "$MERGED" | cat
13
fi
14
}