Mercurial > hg
log tests/test-resolve.t @ 43016:92c8bae84e7a
| age | author | description |
|---|---|---|
| Wed, 21 Aug 2019 13:14:39 -0700 | Martin von Zweigbergk | merge: hint about using `hg resolve` for resolving conflicts |
| Thu, 20 Jun 2019 11:40:47 -0700 | Kyle Lippincott | filemerge: make last line of prompts <40 english chars (issue6158) |
| Tue, 29 Jan 2019 12:01:13 -0800 | Martin von Zweigbergk | resolve: respect ui.relative-paths |
| Wed, 07 Nov 2018 15:45:09 -0800 | Kyle Lippincott | resolve: fix mark-check when a file was deleted on one side (issue6020) |
| Sat, 10 Nov 2018 12:07:26 +0900 | Yuya Nishihara | merge with stable |
| Wed, 07 Nov 2018 15:42:56 -0800 | Kyle Lippincott | tests: make the commands.resolve.confirm tests not pollute the test-wide hgrc |
| Wed, 07 Nov 2018 15:41:18 -0800 | Kyle Lippincott | tests: fix a couple typos in test-resolve.t comments and add a comment |