diff tests/test-stabilize-conflict.t @ 3784:838fc71ddb9c stable

next-prev: replace the error hint to mention about `--merge` flag
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 03 Jun 2018 03:21:25 +0530
parents f6979d64b9fb
children 19ec729f3ca2 ededd22e7c7b
line wrap: on
line diff