Make 'update' warn about merge conflicts

[test.git] / config.h

diff --git a/config.h b/config.h
index 3c7fdf1dbcc3860665ad18dc14c3d5e40522a860..b13bf504bd991e5ee12f1400c2507871703ae5de 100644 (file)
--- a/config.h
+++ b/config.h
@@ -135,7 +135,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "146"
+#define VCS_REVISION "147"
 
 /* Version number of package */
 #define VERSION "2.9"