tests: fix a test case to not create conflicts This is the test case where we are testing about divergence resolution of stack of patches. If the stack is as follows: C1 C2 | | B1 B2 | | A1 A2 \/ base And A1-A2, B1-B2 and C1-C2 are content-divergent, and merging A1-A2 results in conflicts. Now if you resolve conflicts and continue resoling B1-B2, the conflicts of A1-A2 will still be there. We need somehow to understand the work we has done and not create conflicts again. To test the evolution functionality for now, we make sure conflicts does not occur.

     1

syntax: re

     2

/figures/[^/]+\.png$

     3

^html/

     4

\.pyc$

     5

~$

     6

\.swp$

     7

\.orig$

     8

\.rej$

     9

^tests/.*\.err$

    10

^tests/easy_run.sh$

    11

^build/

    12

^dist/

    13

^MANIFEST$

    14

^docs/tutorials/.*\.rst$

    15

\.ico$

    16

tests/\.testtimes

    17

    18

^docs/training/graphs/

    19

^docs/training/html/

    20

^docs/training/index.html

    21

^docs/training/graphviz-images/

    22

^docs/training/img/

    23

^docs/training/output/

    24

^docs/training/pandocfilters/