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
docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
[git.git]
/
mergetools
/
ecmerge
blob
13c2e439def45fe6cf58ae4345355894463ba34f
1
diff_cmd () {
2
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
3
}
4
5
merge_cmd () {
6
touch "$BACKUP"
7
if $base_present
8
then
9
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
10
--default --mode=merge3 --to="$MERGED"
11
else
12
"$merge_tool_path" "$LOCAL" "$REMOTE" \
13
--default --mode=merge2 --to="$MERGED"
14
fi
15
check_unchanged
16
}