changeset 22248 | 75618a223e18 |
parent 22205 | 9fa429723f26 |
child 23584 | db03ed8cbfa3 |
child 23598 | c02a05cc6f5e |
--- a/tests/test-commit.t Sat Aug 16 10:19:26 2014 -0700 +++ b/tests/test-commit.t Sat Aug 16 10:43:59 2014 +0900 @@ -9,7 +9,7 @@ > true > EOF $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m "" - HGEDITFORM=commit.normal + HGEDITFORM=commit.normal.normal abort: empty commit message [255] $ hg commit -d '0 0' -m commit-1 @@ -282,7 +282,8 @@ should succeed - $ hg ci -mmerge + $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit + HGEDITFORM=commit.normal.merge $ cd ..