--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 15255431FDB\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:52:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id XOuzmOGNGCsd for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Aug 2013 05:52:26 -0700 (PDT)\r
+Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com\r
+ [209.85.214.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 548F8431E82\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:52:26 -0700 (PDT)\r
+Received: by mail-bk0-f43.google.com with SMTP id mz13so1157269bkb.30\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:52:25 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=NfKE8QKqimveHdsmntY9PG293k5QEWSlvZY5hLMsDlE=;\r
+ b=atOJMHMlLHr9fIuydtXWqPMn+0akR4sGQYjT2SLP6Y8TnH6MpD3enK/IPc+IzhDKnQ\r
+ GCJu4pDSKkc5kYe0S0hsq7D3gIip2D2LrdR349n048D45l1hXV3eoBHqCSpYu/TZCILt\r
+ PGTrpuVqtd+kaS8e2DGsWWEtcXp+zp4zvYKxeTSpfunsmaldhxGhwpCH3feGe4QbHsdT\r
+ ou23bIzJ+9yziD2e3sSNhJUQV7VzeCKMsg5TKlmMEayq1uiOdQKoo7EwWaw4SMhnHgr+\r
+ ZYyJaZ/qbcFJ+PRfyuXrW9qFI2v3NQNQYAESJjXB3KZY9S79XLgy7UE5d+KCckLSR/Xa\r
+ pryQ==\r
+X-Gm-Message-State:\r
+ ALoCoQl3GAFURC2v0HfjKIEL6g48fD/eAtRBzhLug/XZpAWvs7LlW1Vh9hyxl+tsMsJk28vEJUiu\r
+X-Received: by 10.204.173.196 with SMTP id q4mr4469236bkz.9.1376830345008;\r
+ Sun, 18 Aug 2013 05:52:25 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id h7sm680018bki.9.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 18 Aug 2013 05:52:24 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 7/8] NEWS: cli options for improved duplicate message\r
+ handling\r
+Date: Sun, 18 Aug 2013 15:52:28 +0300\r
+Message-Id:\r
+ <b930f28871adb22573e6a285b9467ac5fe7cc10d.1376830237.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <m28v00a179.fsf@guru.guru-group.fi>\r
+References: <m28v00a179.fsf@guru.guru-group.fi>\r
+In-Reply-To: <cover.1376830237.git.jani@nikula.org>\r
+References: <cover.1376830237.git.jani@nikula.org>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 18 Aug 2013 12:52:34 -0000\r
+\r
+---\r
+ NEWS | 20 ++++++++++++++++++++\r
+ 1 file changed, 20 insertions(+)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index 722a35d..2e845f4 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -1,3 +1,23 @@\r
++\r
++Notmuch 0.17 (UNRELEASED)\r
++=========================\r
++\r
++Command-Line Interface\r
++----------------------\r
++\r
++New options to better support handling duplicate messages\r
++\r
++ If more than one message file is associated with a message-id,\r
++ `notmuch search --output=files` will print all of them. A new\r
++ `--duplicate=N` option can be used to specify which duplicate to\r
++ print for each message.\r
++\r
++ `notmuch count` now supports `--output=files` option to output the\r
++ number of files associated with matching messages. This may be\r
++ bigger than the number of matching messages due to duplicates\r
++ (i.e. multiple files having the same message-id).\r
++\r
++\r
+ Notmuch 0.16 (2013-08-03)\r
+ =========================\r
+ \r
+-- \r
+1.7.10.4\r
+\r