Mercurial > hg
log tests/test-merge7.t @ 28669:c4b727795d6a
| age | author | description |
|---|---|---|
| Mon, 29 Feb 2016 01:01:20 -0500 | Matt Harbison | tests: flag Windows specific lines about background closing as optional |
| Wed, 25 Nov 2015 14:25:26 -0800 | Siddharth Agarwal | filemerge: add debug output for whether this is a change/delete conflict |
| 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 |
| Sun, 11 Oct 2015 20:47:14 -0700 | Siddharth Agarwal | filemerge: break overall filemerge into separate premerge and merge steps |
| Wed, 07 Oct 2015 00:01:16 -0700 | Siddharth Agarwal | filemerge: normalize 'internal:foo' names to ':foo' |