repo.or.cz
/
alt-git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
mergetool--lib: Refactor tools into separate files
[alt-git.git]
/
mergetools
/
meld
blob
73d70ae28ad1e6a5b38e051442e08c26c074bb22
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE"
3
}
4
5
merge_cmd () {
6
touch "$BACKUP"
7
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
8
check_unchanged
9
}