Mercurial > hg
log tests/test-merge-types.t @ 26967:7a8e9a985c3b
| age | author | description |
|---|---|---|
| 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 |
| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| Wed, 07 Oct 2015 00:27:23 -0700 | Siddharth Agarwal | filemerge: run symlink check for :merge3 |
| Wed, 07 Oct 2015 00:24:44 -0700 | Siddharth Agarwal | filemerge: print correct name of tool for symlink checks |