Merge tag '0.12'

[notmuch] / test / emacs.expected-output / notmuch-hello

diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello
index 196112e85a2308c2ce98794291b04da15726e634..147079064ec94e20ffd43e4bd18c7c6283594bae 100644 (file)
--- a/test/emacs.expected-output/notmuch-hello
+++ b/test/emacs.expected-output/notmuch-hello
@@ -6,9 +6,10 @@ Saved searches: [edit]
 
 Search:                                                                     .
 
-[Show all tags]
+All tags: [show]
 
         Type a search query and hit RET to view matching threads.
                Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
-    `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+      `=' to refresh this screen. `s' to search messages. `q' to quit.
+                           Customize this page.