Ralf Hemmecke <hemme...@gmail.com> writes: > Or simpler still, since no additional setup would be necessary (except > for "git config"). > > git config --global merge.too kdiff3
s/too/tool/ > git checkout somebranch > git rebase otherbranch > # in case of conflict > git mergetool > git rebase --continue > > But unfortunately you are not using git. Yet. :) -Keshav ---- Join us in #sagemath on irc.freenode.net ! -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
