Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅ next
commit
grep
author
committer
pickaxe
?
re
Make cherry-pick use rerere for conflict resolution.
[gitweb.git]
/
t
/
t6026-merge-attr.sh
2007-04-18
Custom low-level merge driver support.
blob
|
diff
|
raw
2007-04-17
Add a demonstration/test of customized merge.
blob
|
diff
|
raw
|
diff to current