Revert "Merge branch 'en/merge-recursive'"
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:17:44 +0000 (20:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:33:38 +0000 (20:33 -0700)
commit6db4105...a360d83e89114602ecc81c208323080f
tree7a9f293...1cb3441cb34fec70cfd0a307302c21a3copy hash to clipboard (tree)
parentd192508...d6867059ccc4ce0946ec1110028dad37copy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh