filemerge: be more strict when detecting conflict markers, add `|` markers
I received a user complaint about detecting a line that contained 78 `=`
followed by `*/` as a conflict marker. We'll never generate that, we generate 7
identical characters and either the end of the line, or a space. Let's be
explicit about detecting exactly what we produce to reduce the chances of a
false positive.
While we're here, add `|||||||` as a detected conflict marker (generated with
the `keep-merge3` style conflicts).
Differential Revision: https://phab.mercurial-scm.org/D11391
#!/usr/bin/env bash
hg init rebase
cd rebase
# @ 7: 'H'
# |
# | o 6: 'G'
# |/|
# o | 5: 'F'
# | |
# | o 4: 'E'
# |/
# | o 3: 'D'
# | |
# | o 2: 'C'
# | |
# | o 1: 'B'
# |/
# o 0: 'A'
echo A > A
hg ci -Am A
echo B > B
hg ci -Am B
echo C > C
hg ci -Am C
echo D > D
hg ci -Am D
hg up -q -C 0
echo E > E
hg ci -Am E
hg up -q -C 0
echo F > F
hg ci -Am F
hg merge -r 4
hg ci -m G
hg up -q -C 5
echo H > H
hg ci -Am H
hg bundle -a ../rebase.hg
cd ..
rm -Rf rebase