projects
/
git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
blame
|
history
|
raw
|
HEAD
i18n: add--interactive: remove %patch_modes entries
[git]
/
mergetools
/
opendiff
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3
}
4
5
merge_cmd () {
6
touch "$BACKUP"
7
if $base_present
8
then
9
"$merge_tool_path" "$LOCAL" "$REMOTE" \
10
-ancestor "$BASE" -merge "$MERGED" | cat
11
else
12
"$merge_tool_path" "$LOCAL" "$REMOTE" \
13
-merge "$MERGED" | cat
14
fi
15
check_unchanged
16
}