projects
/
git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
blame
|
history
|
raw
|
HEAD
Merge branch 'jk/describe-omit-some-refs' into maint
[git]
/
mergetools
/
diffuse
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
}