From: Junio C Hamano Date: Fri, 24 Jul 2015 21:31:23 +0000 (-0700) Subject: RelNotes: am.threeWay does not exist (yet) X-Git-Tag: v2.5.0~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f9504c48ea59951a2aa3ee17e7c7fc36285e225;p=thirdparty%2Fgit.git RelNotes: am.threeWay does not exist (yet) Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.txt index b516335f68..87044504c5 100644 --- a/Documentation/RelNotes/2.5.0.txt +++ b/Documentation/RelNotes/2.5.0.txt @@ -127,8 +127,6 @@ UI, Workflows & Features * "git send-email" learned the alias file format used by the sendmail program (in a simplified form; we obviously do not feed pipes). - * "git am" learned am.threeWay configuration variable. - * Traditionally, external low-level 3-way merge drivers are expected to produce their results based solely on the contents of the three variants given in temporary files named by %O, %A and %B on their