Mercurial > hg
log tests/test-copy-move-merge.t @ 29185:28e7f590be2d
| age | author | description |
|---|---|---|
| Wed, 23 Mar 2016 13:34:47 -0700 | Martijn Pieters | graphmod: set default edge styles for ascii graphs (BC) |
| 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:41:20 -0800 | Siddharth Agarwal | test-copy-move-merge.t: explicitly request changed version |
| 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 |
| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |
| Wed, 07 Oct 2015 00:01:16 -0700 | Siddharth Agarwal | filemerge: normalize 'internal:foo' names to ':foo' |