Mercurial > hg
log tests/test-rename-merge2.t @ 29151:7996c3acc33b
| age | author | description |
|---|---|---|
| Mon, 29 Feb 2016 01:01:20 -0500 | Matt Harbison | tests: flag Windows specific lines about background closing as optional |
| Wed, 23 Dec 2015 12:51:45 -0800 | Siddharth Agarwal | filemerge: default change/delete conflicts to 'leave unresolved' (BC) |
| Mon, 30 Nov 2015 13:43:55 -0800 | Siddharth Agarwal | filemerge: add a 'leave unresolved' option to change/delete prompts |
| Wed, 25 Nov 2015 14:25:26 -0800 | Siddharth Agarwal | filemerge: add debug output for whether this is a change/delete conflict |
| Wed, 25 Nov 2015 14:25:33 -0800 | Siddharth Agarwal | merge: move almost all change/delete conflicts to resolve phase (BC) (API) |
| Mon, 30 Nov 2015 10:19:39 -0800 | Siddharth Agarwal | merge: add a new action type representing files to add/mark as modified |
| Wed, 11 Feb 2015 22:22:29 -0800 | Martin von Zweigbergk | test-rename-merge2: make selected output less arbitrary |