[PATCH 1 of 3] update: remove redundant and misplaced merge tests

[Matt Mackall]

On Tue, 2014-12-02 at 17:42 -0800, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1417567199 28800
> #      Tue Dec 02 16:39:59 2014 -0800
> # Node ID 530ec01e5ec31acd0e147756a8f6797847c186c9
> # Parent  fc76f55705eb5884707c977ecb756aee7c794676
> update: remove redundant and misplaced merge tests

Queued with enthusiasm, thanks. Not often we see the test suite get
smaller.

-- 
Mathematics is the supreme nostalgia of our time.