RelNotes: am.threeWay does not exist (yet)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 24, 2015 at 14:31 UTC
6f9504c48ea59951a2aa3ee17e7c7fc36285e225
1 file changed
-2
Documentation/RelNotes/2.5.0.txt
-2
@@ -127,8 +127,6 @@ UI, Workflows & Features
127
* "git send-email" learned the alias file format used by the sendmail
128
program (in a simplified form; we obviously do not feed pipes).
129
130
- * "git am" learned am.threeWay configuration variable.
131
-
130
* Traditionally, external low-level 3-way merge drivers are expected
131
to produce their results based solely on the contents of the three
132
variants given in temporary files named by %O, %A and %B on their