# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1523457488 14400
# Node ID 32514537771324f4c4d870edfb300e67b1fbc00f
# Parent  2815f3257c9a90431dd8e2bd36600b40b442f556# Parent  88a81bdc73f19b0b3a25d56a56481106cded3134
maint: Merge stable to default.

diff -r 2815f3257c9a -r 325145377713 .hgtags
--- a/.hgtags	Wed Apr 11 00:43:54 2018 -0400
+++ b/.hgtags	Wed Apr 11 10:38:08 2018 -0400
@@ -108,4 +108,8 @@
 69ac19073ae630b276ff7788b78f72782f281657 rc-4-2-0-4
 708a4fcb73820484a3af94dd4d18453c4d9b29c9 release-4-2-0
 1327ea4f5a931a6cc2a6d4790af58cf16de4702b release-4-2-1
+<<<<<<< working copy
 94f8e2b5a88b79974084c0ae541cacbcc62d64f6 release-4-2-2
+=======
+a5ad9c053e41ed39a8c69ff99936cbcf18256abf rc-4-3-90
+>>>>>>> merge rev
diff -r 2815f3257c9a -r 325145377713 configure.ac