repo.or.cz
/
git
/
mingw.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'lf/bundle-exclusion' into maint
[git/mingw.git]
/
mergetools
/
diffmerge
blob
85ac7201571ed34c35a3613b97bd1b82982e0d61
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3
}
4
5
merge_cmd () {
6
if $base_present
7
then
8
"$merge_tool_path" --merge --result="$MERGED" \
9
"$LOCAL" "$BASE" "$REMOTE"
10
else
11
"$merge_tool_path" --merge \
12
--result="$MERGED" "$LOCAL" "$REMOTE"
13
fi
14
status=$?
15
}