git-cvsimport: fix merging with remote parent branch
authorMarc-Andre Lureau <marcandre.lureau@gmail.com>
Wed, 12 Mar 2008 19:54:21 +0000 (21:54 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Mar 2008 04:03:39 +0000 (21:03 -0700)
commitc36c5b8...5e1958bad1b69ee42e3da926de4f948b
tree3f5d019...d3a303b4d8ce20fef828abb2fef4b897copy hash to clipboard (tree)
parent7863c61...f402268b5978683f44adad3a7a867613copy hash to clipboard (diff)
git-cvsimport.perl