projects
/
git
/ blame
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
blob
|
blame
(incremental) |
history
|
HEAD
Merge branch 'sn/http-auth-with-netrc-fix'
[git]
/
mergetools
/
p4merge
Commit
Line
Data
bc7a96a8
DA
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
}