Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output

     1

% init

     2

adding a

     3

% fold in the middle of the queue

     4

now at: p1

     5

--- a/a

     6

+++ b/a

     7

@@ -1,1 +1,2 @@

     8

 a

     9

+a

    10

p1

    11

p3

    12

--- a/a

    13

+++ b/a

    14

@@ -1,1 +1,3 @@

    15

 a

    16

+a

    17

+b

    18

% fold with local changes

    19

abort: local changes found, refresh first

    20

--- a/a

    21

+++ b/a

    22

@@ -1,1 +1,3 @@

    23

 a

    24

+a

    25

+b