annotate tests/fake-editor.sh @ 3574:8aba29d8b133

previous/next: add -m short form for --merge This matches core's option to `hg update`. This patch also covers `hg next`, but test-check-commit.t only lets me mention one of them.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 19 Mar 2018 11:18:47 -0700
parents 970a4c13ebc3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
diff changeset
1 #!/bin/sh
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
diff changeset
2 sleep 5
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
diff changeset
3 echo "new desc" >> $1