I created a branch from HEAD, worked on it for awhile, but never merged it back to HEAD. For various reasons (mostly my CVS incompetence) merging the branch back to HEAD or merging HEAD to the branch is generating tons of conflicts. Is there a way to generate a diff between the initial state of the branch and its current state?
Thanks, Skip Montanaro
