Mercurial > hg
log tests/test-merge-types.t @ 29481:5caa415aa48b
| age | author | description |
|---|---|---|
| Tue, 02 Feb 2016 14:49:02 +0000 | Pierre-Yves David | update: warn about other topological heads on bare update |
| Tue, 01 Dec 2015 09:48:38 -0800 | Siddharth Agarwal | filemerge: default regular prompts to 'leave unresolved' (BC) |
| Mon, 30 Nov 2015 11:17:18 -0800 | Siddharth Agarwal | filemerge: add a 'leave unresolved' option to regular prompts |
| Wed, 25 Nov 2015 14:25:26 -0800 | Siddharth Agarwal | filemerge: add debug output for whether this is a change/delete conflict |
| Wed, 11 Nov 2015 10:19:11 -0800 | Martin von Zweigbergk | filemerge: remove leading space from " no tool found..." |
| Sun, 08 Nov 2015 23:42:44 -0800 | Siddharth Agarwal | filemerge: move :merge-local/other symlink check to precheck |
| Sun, 08 Nov 2015 23:47:20 -0800 | Siddharth Agarwal | test-merge-types.t: add tests for :merge-local/:merge-other with symlinks |