averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4e1be63c3b05fd379b51b611b7e869ff6977d8ab
git-mirror/merge-recursive.c
Junio C Hamano 94468bc1f7 Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint 
* js/maint-merge-recursive-r-d-conflict:
  merge-recursive: mark rename/delete conflict as unmerged
2009-01-13 01:15:19 -08:00

37 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink