Mercurial > hg
log tests/test-subrepo.t @ 29439:c42a3fd5c1fc
age | author | description |
---|---|---|
Mon, 29 Feb 2016 01:01:20 -0500 | Matt Harbison | tests: flag Windows specific lines about background closing as optional |
Tue, 02 Feb 2016 14:49:02 +0000 | Pierre-Yves David | update: warn about other topological heads on bare update |
Fri, 15 Jan 2016 13:46:33 -0800 | Ruslan Sayfutdinov | backout: commit changeset by default (BC) |
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 |