David Eger Mon, 27 Mar 2000 10:32:03 -0800
How much work do you suppose it would be to modify the behavior of merges in CVS so that any conflict areas give a context-type diff as opposed to a straight diff? -David Eger
