log tests/test-merge1.t @ 26355:f51713b8c6fa

age author description
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 ..'