test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
merge: drop resolve state for mergers with identical contents (
issue2680)
match: ignore "" patterns
The following command would visit every changeset in repo/ rather than
the last 10:
hg log -l 10 repo/