From: Horst H. von Brand Date: Fri, 16 Nov 2012 13:05:51 GMT Subject: [PATCH 2/4] RelNotes 1.8.1: Awkward wording Message-ID: <1353071153-1453-2-git-send-email-vonbrand@inf.utfsm.cl> In-Reply-To: <1353071153-1453-1-git-send-email-vonbrand@inf.utfsm.cl> From: "Horst H. von Brand" Signed-off-by: Horst H. von Brand --- Documentation/RelNotes/1.8.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/RelNotes/1.8.1.txt b/Documentation/RelNotes/1.8.1.txt index 559cd05..69baa35 100644 --- a/Documentation/RelNotes/1.8.1.txt +++ b/Documentation/RelNotes/1.8.1.txt @@ -100,7 +100,7 @@ details). * "git mergetool" feeds /dev/null as a common ancestor when dealing with an add/add conflict, but p4merge backend cannot handle - it. Work it around by passing a temporary empty file. + it. Work around this by passing a temporary empty file. (merge 3facc60 da/mergetools-p4 later to maint). * "git log -F -E --grep=''" failed to use the given -- 1.8.0.197.g5a90748