Mercurial > hg
log tests/test-merge-local.t @ 36339:a4d41ba4ad23
| age | author | description |
|---|---|---|
| Mon, 11 Sep 2017 17:49:49 +0000 | Mark Thomas | scmutil: don't append .orig to backups in origbackuppath (BC) |
| Tue, 25 Oct 2016 21:01:53 +0200 | Gábor Stefanik | merge: avoid superfluous filemerges when grafting through renames (issue5407) stable |
| Thu, 25 Aug 2016 22:02:26 +0200 | Gábor Stefanik | update: enable copy tracing for backwards and non-linear updates |
| Mon, 07 Dec 2015 20:43:24 -0800 | Martin von Zweigbergk | merge: refuse update/merge if there are unresolved conflicts (BC) |
| Tue, 10 Nov 2015 16:25:59 -0800 | Christian Delahousse | filemerge: choose where .orig files are kept |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| Wed, 16 Nov 2011 18:04:19 -0600 | Matt Mackall | merge: give a special message for internal:merge failure (issue3105) |