diff options
| author | Doug Evans <dje@google.com> | 2017-03-16 10:39:26 -0700 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2017-03-16 10:40:27 -0700 |
| commit | 2cc36e25db366d70a975702b61c7700ae934d4d0 (patch) | |
| tree | 88ccc6c267e435a2e08ff0cf42d94bb6425683e9 /gdb | |
| parent | a8be5506b626a57f84771c5ddfaefabf2d61c017 (diff) | |
| download | gdb-2cc36e25db366d70a975702b61c7700ae934d4d0.zip gdb-2cc36e25db366d70a975702b61c7700ae934d4d0.tar.gz gdb-2cc36e25db366d70a975702b61c7700ae934d4d0.tar.bz2 | |
Remove collision markers from earlier commit
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 39ff712..aa07cb0 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> |