Sign in
googlers
/
jrn
/
git
/
3f1da57fffdcfb48bd8b85da347f310b955245d7
/
.
/
mergetools
/
kompare
blob: 433686c12a088195bbf21b2e409c21df199ba988 [
file
] [
log
] [
blame
]
David Aguilar
bc7a96a
2011-08-18 00:23:46 -0700
[
diff
] [
blame
]
1
can_merge
()
{
2
return
1
3
}
4
5
diff_cmd
()
{
6
"$merge_tool_path"
"$LOCAL"
"$REMOTE"
7
}
