changeset 21267 | e4f451c8c05c |
parent 21266 | 19d6fec60b81 |
child 21519 | 25d5a9ecbb85 |
--- a/tests/test-commit-amend.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-commit-amend.t Fri May 09 14:46:50 2014 -0500 @@ -586,7 +586,7 @@ merging cc incomplete! (edit conflicts, then use 'hg resolve --mark') [1] $ hg resolve -m cc - no unresolved files; you may continue your unfinished operation + no more unresolved files $ hg ci -m 'merge bar' $ hg log --config diff.git=1 -pr . changeset: 23:d51446492733