repo.or.cz
/
git
/
gitweb.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 'ob/typofixes'
[git/gitweb.git]
/
mergetools
/
codecompare
blob
3f0486bc807133f50abcaab27c991d4a806ec63c
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE"
3
}
4
5
merge_cmd () {
6
touch "$BACKUP"
7
if $base_present
8
then
9
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
10
-RF="$MERGED"
11
else
12
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
13
-RF="$MERGED"
14
fi
15
check_unchanged
16
}
17
18
translate_merge_tool_path() {
19
if merge_mode
20
then
21
echo CodeMerge
22
else
23
echo CodeCompare
24
fi
25
}