Re: problems with vc-merge.
Uwe Brauer writes:
Let me try to elaborate this with an example and let us forget
version
control.
Examples taken out of the context of vc are irrelevant to using vc.
Back now to version control.
Of course I could just use vc-version-other-window twice and run emerge
on these files, but that looks cumbersome.
Why? That is the correct thing to do in this case, since you want a
result that ignores VC.
So I want to use vc-merge somehow:
If I understand you correctly file2 and
file3 cannot be represented by version 1.2 and 1.3
but rather my branches.
No. They can't be represented by (different) branches because they're
on the same branch. They therefore have a common ancestor which is
one of them, and the result of the merge then is the other.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta