Mercurial > hg > octave-lojdl > gnulib-hg

changeset 14116:2256b67fa8bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove merge dinkleberries
author Bruce Korb <bkorb@gnu.org>
date Tue, 14 Dec 2010 12:43:25 -0800
parents ef8b363d4b54
children 9a45e81fffbe
files ChangeLog libposix/.gitignore
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 2010-12-13  Pádraig Brady <P@draigBrady.com>
 
 	read-file: Improve handling of large files
--- a/libposix/.gitignore
+++ b/libposix/.gitignore
@@ -46,3 +46,4 @@
 _b*
 _i*
 /libposix*.tar.*
+/libposix-*