log tests/test-conflict-1.t @ 1032:631d42fbf8a2 0.8.8

age author description
Fri, 16 Oct 2015 16:14:51 -0700 Sean Farley tests: update for new merge output
Sat, 23 Aug 2014 13:05:28 -0400 Augie Fackler tests: adapt for hg 3.1 output changes
Mon, 19 May 2014 19:52:22 -0700 Siddharth Agarwal tests: fix breakage caused by Mercurial changes
Sun, 06 Jan 2013 01:46:57 -0500 David M. Carr push: add more output about what was added (issue #64)
Sat, 03 Nov 2012 19:14:17 -0400 David M. Carr tests: convert echos to comments
Sat, 03 Nov 2012 19:12:08 -0400 David M. Carr tests: avoid changing the current directory
Sat, 03 Nov 2012 19:11:50 -0400 David M. Carr tests: extract git command-line client and dulwich requirements into testutil
Wed, 31 Oct 2012 00:01:03 -0400 David M. Carr tests: let git init create directories when applicable
Tue, 30 Oct 2012 20:03:26 -0400 David M. Carr tests: extract extension configuration into a testutil library
Mon, 29 Oct 2012 00:17:55 -0400 David M. Carr tests: uncomment calls to hghave git
Thu, 25 Oct 2012 21:47:44 -0400 David M. Carr push: suppress "exporting hg objects to git" message
Sun, 07 Oct 2012 20:11:27 -0400 David M. Carr push: change "no changes" default output to match normal mercurial
Thu, 13 Sep 2012 20:49:45 -0400 David M. Carr tests: eliminate use of git-daemon
Thu, 13 Sep 2012 20:49:42 -0400 David M. Carr tests: remove piping of command git init to remove leading path
Thu, 13 Sep 2012 20:48:11 -0400 David M. Carr tests: remove configuration of bookmarks extension
Mon, 10 Sep 2012 00:26:37 -0400 David M. Carr tests: unify test-conflict-1 base tests/test-conflict-1@f46873c62ede