Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Duy Nguyen
git
Repository
git
merge-recursive.c
Find file
Blame
History
Permalink
Merge branch 'js/maint-merge-recursive-r-d-conflict'
· ff323406
Junio C Hamano
authored
Jan 07, 2009
* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged
ff323406