From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 01 Jul 2010 15:10:02 GMT
Subject: [PATCH 6/8] t/README: Document test_expect_code
Message-ID: <1277997004-29504-7-git-send-email-avarab@gmail.com>
In-Reply-To: <1277997004-29504-1-git-send-email-avarab@gmail.com>

test_expect_code (which was introduced in d3bfdb75) never had any
documentation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 t/README |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/t/README b/t/README
index 43d6d4d..6232567 100644
--- a/t/README
+++ b/t/README
@@ -276,6 +276,13 @@ library for your script to use.
    
    Like test_expect_success this function can optionally use a three
    argument invocation with a prerequisite as the first argument.
+   
+ - test_expect_code [<prereq>] <code> <message> <script>
+ 
+   Analogous to test_expect_success, but pass the test if it exits
+   with a given exit <code>
+ 
+ test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
 
  - test_debug <script>
 
-- 
1.7.1.251.g92a7