projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Give default merge message after failed automerge.
[git]
/
git-merge-resolve.sh
2005-09-11
Junio C Hamano
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
commitdiff
|
raw
2005-09-11
Junio C Hamano
Multi-backend merge driver.
blob
|
commitdiff
|
raw
|
diff to current
projects / git / history
Junio C Hamano Junio C Hamano