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
contrib/subtree: make the manual directory if needed
[git.git]
/
mergetools
/
defaults
blob
21e63ecc3e019252c5c9ab5c26b1ea72f5952cc7
1
# Redefined by builtin tools
2
can_merge () {
3
return 0
4
}
5
6
can_diff () {
7
return 0
8
}
9
10
diff_cmd () {
11
status=1
12
return $status
13
}
14
15
merge_cmd () {
16
status=1
17
return $status
18
}
19
20
translate_merge_tool_path () {
21
echo "$1"
22
}