提交 6f9504c4 编写于 作者: J Junio C Hamano

RelNotes: am.threeWay does not exist (yet)

Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 15dc5b5f
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册