Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets/lists/tests Remove accidentally committed merge...



details:   https://anonhg.NetBSD.org/src/rev/a919e9e72642
branches:  trunk
changeset: 366669:a919e9e72642
user:      nia <nia%NetBSD.org@localhost>
date:      Mon Jun 06 10:57:05 2022 +0000

description:
Remove accidentally committed merge conflict line.

diffstat:

 distrib/sets/lists/tests/mi |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (10 lines):

diff -r 3906cbeb351a -r a919e9e72642 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Mon Jun 06 10:56:27 2022 +0000
+++ b/distrib/sets/lists/tests/mi       Mon Jun 06 10:57:05 2022 +0000
@@ -1,5 +1,4 @@
-=======
-# $NetBSD: mi,v 1.1210 2022/06/06 10:56:28 nia Exp $
+# $NetBSD: mi,v 1.1211 2022/06/06 10:57:05 nia Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #



Home | Main Index | Thread Index | Old Index