* [OB PATCH] Remove patch collision markers in testsuite/ChangeLog
@ 2017-03-16 17:56 Doug Evans via gdb-patches
0 siblings, 0 replies; only message in thread
From: Doug Evans via gdb-patches @ 2017-03-16 17:56 UTC (permalink / raw)
To: gdb-patches
Bleah.
commit 2cc36e25db366d70a975702b61c7700ae934d4d0
Author: Doug Evans <dje@google.com>
Date: Thu Mar 16 10:39:26 2017 -0700
Remove collision markers from earlier commit
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 39ff712e74..aa07cb05ff 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
2017-03-16 Thomas Preud'homme <thomas.preudhomme@arm.com>
* gdb.cp/m-static.exp: Fix expectation for prototype of
test5.single_constructor and single_constructor::single_constructor.
-=======
-2017-03-15 Doug Evans <dje@google.com>
+
+2017-03-16 Doug Evans <dje@google.com>
* gdb.guile/scm-value.c (main) Delete locals sptr, sn.
* gdb.guile/scm-lazy-string.c: New file.
@@ -12,7 +11,7 @@
* gdb.guile/scm-lazy-string.exp: ... here, new file. Add more tests
for pointer, array, typedef lazy strings.
-2017-03-15 Doug Evans <dje@google.com>
+2017-03-16 Doug Evans <dje@google.com>
PR python/17728, python/18439, python/18779
* gdb.python/py-value.c (main) Delete locals sptr, sn.
@@ -21,7 +20,6 @@
* gdb.python/py-value.exp: Move lazy string tests to ...
* gdb.python/py-lazy-string.exp: ... here. Add more tests for pointer,
array, typedef lazy strings.
->>>>>>> Fix various python lazy string bugs.
2017-03-14 Anton Kolesov <anton.kolesov@synopsys.com>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-03-16 17:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-16 17:56 [OB PATCH] Remove patch collision markers in testsuite/ChangeLog Doug Evans via gdb-patches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).