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 'jk/maint-push-v-is-verbose'
[git/gitweb.git]
/
mergetools
/
tortoisemerge
blob
ed7db495eda9b70bee7e077a0de07d30518cbf2a
1
can_diff () {
2
return 1
3
}
4
5
merge_cmd () {
6
if $base_present
7
then
8
touch "$BACKUP"
9
"$merge_tool_path" \
10
-base:"$BASE" -mine:"$LOCAL" \
11
-theirs:"$REMOTE" -merged:"$MERGED"
12
check_unchanged
13
else
14
echo "TortoiseMerge cannot be used without a base" 1>&2
15
return 1
16
fi
17
}