projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c6e8aa 36e3b5e)
Merge branch 'js/maint-merge-recursive-r-d-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:42 +0000 (00:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:42 +0000 (00:09 -0800)
commitff32340669a5521ca2b4b547b4853bfe22f60386
treebca331f6b19b2465ca5c71ab879ce03874f9be58tree | snapshot
parent4c6e8aa8f001fa9619dc891c501d0d4389583353commit | diff
parent36e3b5eafe967cb721f5e2bbaa396f979b8ebd7ccommit | diff
Merge branch 'js/maint-merge-recursive-r-d-conflict'

* js/maint-merge-recursive-r-d-conflict:
  merge-recursive: mark rename/delete conflict as unmerged
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.