> > > If thats the case - when you have a merge conflict during 'merge' or > 'rebase' - then you should be able to do 'git mergetool' and easily > resolve the conflict using kdiff3 > > OK, well this looks promising (kdiff3 seems to work, I think we set this up long ago): ... nothing added to commit but untracked files present Could not apply 95a678b879f0666d009cbaa65ec66f87451d4d65... DMP4est: fix coarseEdge calculation in transfer_Point 11:19 1 jed/mark/snes-ex56c|REBASE-i 93/195 ~/Codes/petsc/src/snes/examples/tutorials$ git mergetool
This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare emerge vimdiff No files need merging 11:32 jed/mark/snes-ex56c|REBASE-i 93/195 ~/Codes/petsc/src/snes/examples/tutorials$ > Satish >
