repo.or.cz
/
git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
l10n: sv.po: Update Swedish translation (4676t0f0u)
[git.git]
/
mergetools
/
smerge
blob
9c2e6f6fd7d0a72c200b9f68f1f0f926318a27ba
1
diff_cmd () {
2
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
3
}
4
5
merge_cmd () {
6
if $base_present
7
then
8
"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
9
else
10
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
11
fi
12
}