log tests/test-merge1.t @ 28996:b74ca9ace65e stable

age author description
Tue, 12 Jan 2016 18:38:49 -0800 Siddharth Agarwal merge: split up checks for unknown and ignored files that differ
Sat, 02 Jan 2016 03:11:52 -0800 Siddharth Agarwal merge: add options to warn or ignore on colliding unknown files
Mon, 28 Dec 2015 22:51:37 -0800 Siddharth Agarwal merge: while checking for unknown files don't follow symlinks (issue5027) stable
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Wed, 08 Jul 2015 17:01:09 +0900 FUJIWARA Katsunori context: write dirstate out explicitly after marking files as clean
Fri, 29 May 2015 22:23:58 +0200 Gilles Moris summary: move the parents phase marker to commit line (issue4688)
Thu, 14 May 2015 17:38:38 +0200 Gilles Moris summary: add a phase line (draft, secret) to the output
Mon, 23 Sep 2013 20:50:51 -0700 Siddharth Agarwal merge: standardize error message for dirty working dir
Thu, 25 Jul 2013 02:44:27 -0500 Matt Mackall tests: glob out exception type for directory collision stable
Thu, 25 Jul 2013 00:33:28 -0500 Matt Mackall update: add tracking of interrupted updates (issue3113) stable
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Wed, 11 Jan 2012 15:53:42 -0500 Jordi GutiƩrrez Hermoso merge: report all files in _checkunknown
Wed, 07 Dec 2011 11:23:01 -0600 Kevin Bullock merge: make 'nothing to merge' aborts consistent
Thu, 13 Oct 2011 04:27:49 +0200 Mads Kiilerich tests: cleanup of echo statements left over from test conversion
Tue, 19 Apr 2011 12:04:44 +0200 Martin Geisler tests: remove redundant mkdir