Mercurial > hg
log tests/test-merge-criss-cross.t @ 41722:37b33c34bf4f
| age | author | description |
|---|---|---|
| Tue, 26 Jun 2018 15:26:21 -0700 | Sean Farley | revset: add optimization for heads(commonancestors()) |
| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
| Sun, 10 Dec 2017 22:50:57 -0500 | Matt Harbison | tests: remove (glob) annotations that were only for '\' matches |
| Sat, 01 Apr 2017 14:48:39 -0400 | Matt Harbison | tests: add globs for Windows |
| Tue, 31 Jan 2017 03:25:59 +0100 | Mads Kiilerich | merge: fix crash on criss cross merge with dir move and delete (issue5020) stable |
| Tue, 31 Jan 2017 03:20:07 +0100 | Mads Kiilerich | tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping stable |
| Tue, 02 Feb 2016 15:24:11 +0000 | Pierre-Yves David | update: change default destination to tipmost descendant (issue4673) (BC) |