Mercurial > octave

changeset 25210:325145377713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Apr 2018 10:38:08 -0400
parents 2815f3257c9a (current diff) 88a81bdc73f1 (diff)
children e98c6d393abb
files .hgtags configure.ac
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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