tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
Use extended SHA1 syntax in merge-recursive conflicts.
[git.git]
/
merge-recursive.c
2006-07-28
Johannes Schindelin
Cumulative update of merge-recursive in C
blob
|
commitdiff
|
raw
|
diff to current
2006-07-14
Junio C Hamano
Merge branch 'lt/unitype' into js/c-merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2006-07-14
Johannes Schindelin
Status update on merge-recursive in C
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
