Meld looks like a great tool for merge resolution, except I can't tell which column is which.
I was quite a long way into the 7i76 driver when I found that sserial needs to support setup modes. So, I created a new branch based on 2.5 and made the changes. I then tried to rebase the 7i76 branch on the new branch, and had a merge fail. I called up mergetool (meld in my case) and that shows a nice easy to understand GUI. which looks ideal, if I had any idea which column represented which branch. Any clues? -- atp "Torque wrenches are for the obedience of fools and the guidance of wise men" ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
