From c0bc2eeb1e03593ca816f63deda662da5a25ab83 Mon Sep 17 00:00:00 2001 From: Mike Ralphson Date: Tue, 3 Mar 2009 19:29:20 +0000 Subject: Documentation: Typos / spelling fixes in RelNotes Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.1.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes-1.6.1.1.txt') diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt index 88454c1973..8c594ba02f 100644 --- a/Documentation/RelNotes-1.6.1.1.txt +++ b/Documentation/RelNotes-1.6.1.1.txt @@ -41,11 +41,11 @@ Fixes since v1.6.1 work tree upon delete/modify conflict. * "git merge -s recursive" didn't leave the index unmerged for entries with - rename/delete conflictd. + rename/delete conflicts. * "git merge -s recursive" clobbered untracked files in the work tree. -* "git mv -k" with more than one errorneous paths misbehaved. +* "git mv -k" with more than one erroneous paths misbehaved. * "git read-tree -m -u" hence branch switching incorrectly lost a subdirectory in rare cases. -- cgit v1.2.1