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
resolve_ref(): verify that the input refname has the right format
[alt-git.git]
/
mergetools
/
p4merge
blob
1a45c1b0c5128335fc340e7d6409b4e772419a07
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE"
3
}
4
5
merge_cmd () {
6
touch "$BACKUP"
7
$base_present || >"$BASE"
8
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
9
check_unchanged
10
}