git submodule vs git mergetool

From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Jan 18, 2011, 09:04 UTC
Message-ID: <AANLkTi=jS1LQY0kfSD_=o0PZ9BAF7k=06QFT+agkvGNa@mail.gmail.com>

Hi there,

  not sure if this is the right place to report a problem. anyway I
have two branches (release and master) each one has a Testing/Data
submodule:

git submodule add git://gdcm.git.sourceforge.net/gitroot/gdcm/gdcmData Testing/Data

  During a merge those two submodules produced a conflict:

$ git mergetool merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff Merging the files: Testing/Data

mv: cannot stat `Testing/Data': No such file or directory
cp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory
error: git checkout-index: cannot create temporary subproject
error: git checkout-index: cannot create temporary subproject
Normal merge conflict for 'Testing/Data':
  {local}: created
  {remote}: created
Hit return to start merge resolution tool (gvimdiff):
3 files to edit
Testing/Data seems unchanged.
Was the merge successful? [y/n] y
fatal: unable to stat 'Testing/Data': No such file or directory

I guess this is a minor issue, but I thought I should report it here.

Thanks for this tool !

-- 
Mathieu