repo.or.cz
/
alt-git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
log: add -P as a synonym for --perl-regexp
[alt-git.git]
/
mergetools
/
opendiff
blob
b608dd6de30aaab9b30729145029761330f9fb55
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
}