From ade7fb95b18717787a0a0eca521df06e3577ea22 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sat, 8 Nov 2014 11:33:11 +0900
Subject: [PATCH] Fix failing test case

---
 test/workflow.vader | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/workflow.vader b/test/workflow.vader
index df13b0d..5afe275 100644
--- a/test/workflow.vader
+++ b/test/workflow.vader
@@ -304,7 +304,8 @@ Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
 
   " ]] motion
   execute 'normal $]]'
-  AssertEqual lnum + 4, line('.')
+  Assert index([lnum + 4, lnum + 5], line('.')) >= 0
+   " +5 for merge commit
   AssertEqual 3, col('.')
 
   " [[ motion