So we're all staring at a wrapped lines so you can do a 3-way merge? How often do you need to merge anyways? More often than you write code? Often enough for it to be the limiting factor?

How did they do interactive merges when they were limited to 80 characters?