Mercurial > hg
log tests/test-merge-force.t @ 29185:28e7f590be2d
| age | author | description |
|---|---|---|
| Wed, 03 Feb 2016 13:11:34 -0800 | Siddharth Agarwal | test-merge-force: add tests for merge.checkunknown=warn |
| Wed, 23 Dec 2015 12:51:45 -0800 | Siddharth Agarwal | filemerge: default change/delete conflicts to 'leave unresolved' (BC) |
| Sun, 27 Dec 2015 15:24:48 -0800 | Danek Duvall | tests: Solaris diff -U also emits "No differences encountered" |
| 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:33 -0800 | Siddharth Agarwal | merge: move almost all change/delete conflicts to resolve phase (BC) (API) |
| Tue, 24 Nov 2015 15:03:00 -0800 | Siddharth Agarwal | test-merge-force.t: check .orig files separately |
| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |