From 61a5a29376bad38a82b8e888f873b6772c1e02ee Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 28 Jul 2012 17:17:58 +0200
Subject: [PATCH] Ignore git's merge conflict files when finding unit tests

---
 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 35f1d9a0e..aef2b6d5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,10 +131,7 @@ elif test ! -f $srcdir/version.c; then
 fi
 
 dnl Find test suite files.
-test_suites=""
-for x in $srcdir/test/test_*.c; do
-    test_suites="$test_suites $x"
-done
+test_suites=`ls test/test_*.c | grep -Ev 'BASE|BACKUP|LOCAL|REMOTE' | xargs echo`
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-- 
2.47.3