*** empty log message ***

1 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 43e76adf7..a1e2b40be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,19 @@
-2004-06-26  Jim Meyering  <jim@meyering.net>
+2004-06-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* Version 5.3.0.
 
+	Fix a bug: formerly, if d/x was a directory and x a file, "ln x
+	d/" incorrectly created a link d/x/x.  It also saves some system
+	calls.
+
+	* NEWS: Document the fix.
+
+	* src/ln.c (main): Don't append basename to dest if this
+	results in an existing directory name.
+	* tests/ln/misc: See whether a trailing slash is followed too far.
+
+2004-06-26  Jim Meyering  <jim@meyering.net>
+
 	* src/printf.c (main): When given no arguments, print the standard
 	"missing operand\nTry printf --help..." message -- to be consistent.
 
@@ -69,7 +81,6 @@
 	correctly.
 	(format_user_width, format_group_width): Use it.
 
->>>>>>> 1.965
 2004-06-21  Jim Meyering  <jim@meyering.net>
 
 	* tests/priv-check: Quote "$PATH" in PATH=$PATH.