changeset 21266 | 19d6fec60b81 |
parent 21036 | a1a1bd09e4f4 |
child 21267 | e4f451c8c05c |
--- a/tests/test-commit-amend.t Fri Apr 18 18:56:26 2014 -0700 +++ b/tests/test-commit-amend.t Fri Apr 18 22:19:25 2014 -0700 @@ -586,6 +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 $ hg ci -m 'merge bar' $ hg log --config diff.git=1 -pr . changeset: 23:d51446492733