tokkee.org
Code
projects
/
git.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
mergetool--lib: Refactor tools into separate files
[git.git]
/
mergetools
/
meld
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
}