67 

    67 

    68 Fix the 1st conflict:

    68 Fix the 1st conflict:

    69 

    69 

    70   $ echo mq1r1 > f

    70   $ echo mq1r1 > f

    71   $ hg resolve -m f

    71   $ hg resolve -m f

    72   $ hg rebase -c

    73   $ hg rebase -c

    73   merging f

    74   merging f

    74   warning: conflicts during merge.

    75   warning: conflicts during merge.

    75   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')

    76   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')

    76   unresolved conflicts (see hg resolve, then hg rebase --continue)

    77   unresolved conflicts (see hg resolve, then hg rebase --continue)

    78 

    79 

    79 Fix the 2nd conflict:

    80 Fix the 2nd conflict:

    80 

    81 

    81   $ echo mq1r1mq2 > f

    82   $ echo mq1r1mq2 > f

    82   $ hg resolve -m f

    83   $ hg resolve -m f

    83   $ hg rebase -c

    85   $ hg rebase -c

    84   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

    86   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

    85 

    87 

    86   $ hg tglog

    88   $ hg tglog

    87   @  3: 'P1' tags: f2.patch qtip tip

    89   @  3: 'P1' tags: f2.patch qtip tip