--- /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 260C2431FBF\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 04:04:25 -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 FH01XnJlRrxa for <notmuch@notmuchmail.org>;\r
+ Sun, 9 Jun 2013 04:04:19 -0700 (PDT)\r
+Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com\r
+ [209.85.217.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9ABA1431FDF\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 04:03:52 -0700 (PDT)\r
+Received: by mail-lb0-f172.google.com with SMTP id v20so1011530lbc.31\r
+ for <notmuch@notmuchmail.org>; Sun, 09 Jun 2013 04:03:51 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :in-reply-to:references:x-gm-message-state;\r
+ bh=JL5F7ajPzzq0t86oSy2EDUixVx06kcLYRSR4k6xhSmI=;\r
+ b=Ow6XYMCxSSu8I5zdgabaH7iSFcuFdyO+sMgoL4iypUQju9vG4oIjkpbNWCzCXo3zw5\r
+ EAhibeDiDd9akZ84cimz1QjrTZuovUh4Pcmc78Xwj16jAfyp0LbbTOE92H+iI7j69sq8\r
+ 3xuCLbmI5nNV/ZqvyGYVERR9c/5clx5T0+CyYVhgblLHNnSdVktjKXaUgwEFqnjmV5Z9\r
+ +sDyW5N3UK0gsXkYQFGTo87lZjGkv8Ki0IjHC8W/iDi2UV+WsCZ4yCeRB4LCVGRHPY0a\r
+ 6HVqUQRfdboAaLT7ZNiBkaTcbgR+69tfsmeHsVw6EuM/Qcx94APwpuQp3NWlSiHmFdpo\r
+ 7o4Q==\r
+X-Received: by 10.112.169.5 with SMTP id aa5mr4370726lbc.71.1370775831102;\r
+ Sun, 09 Jun 2013 04:03:51 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.\r
+ [88.195.118.211])\r
+ by mx.google.com with ESMTPSA id t17sm3841041lbd.11.2013.06.09.04.03.49\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 09 Jun 2013 04:03:50 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 7/7] NEWS: cli options for improved duplicate message\r
+ handling\r
+Date: Sun, 9 Jun 2013 14:03:13 +0300\r
+Message-Id:\r
+ <044d9d17b340943a7b5d719e537d6bf7f1906d21.1370775663.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1370775663.git.jani@nikula.org>\r
+References: <cover.1370775663.git.jani@nikula.org>\r
+In-Reply-To: <cover.1370775663.git.jani@nikula.org>\r
+References: <cover.1370775663.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlnUcNaz+nY8/CT0MPzAJfxIyxL0K0CQavq06CJlIADnv+zXjNBBRcllTIHR7nGh6Wl1N/s\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, 09 Jun 2013 11:04:25 -0000\r
+\r
+---\r
+ NEWS | 12 ++++++++++++\r
+ 1 file changed, 12 insertions(+)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index e1806c2..2eb2ded 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -4,6 +4,18 @@ Notmuch 0.16 (2013-MM-DD)\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
+ Decrypting commands explicitly expect a gpg-agent\r
+ \r
+ Decryption in `notmuch show` and `notmuch reply` has only ever\r
+-- \r
+1.7.10.4\r
+\r