problems with vc-merge.

Hello I don't understand the following. In version 1.4 the file contains just the line (3 indicates line number) --8<------------------------schnipp------------------------->8--- 3 This is the line of version 4. --8<------------------------schnapp------------------------->8--- In version 1.5 I Added a line (line number 5) --8<------------------------schnipp------------------------->8--- 5 this is the line of version 5 and I will kill line 3. --8<------------------------schnapp------------------------->8--- And indeed killed line 3. So I wanted to merge version 1.4 with 1.5 and expected: --8<------------------------schnipp------------------------->8--- 3 This is the line of version 4. 5 this is the line of version 5 and I will kill line 3. --8<------------------------schnapp------------------------->8--- But I obtained: --8<------------------------schnipp------------------------->8--- 3 This is the line of version 4. --8<------------------------schnapp------------------------->8--- Which is simply version 1.4. I am puzzled, anybody has an idea. Uwe Brauer _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta