development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

RelNotes: am.threeWay does not exist (yet)

Browse source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-07-24 14:31:23 -07:00
parent 15dc5b5fb0
commit 6f9504c48e
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/RelNotes/2.5.0.txt
View file

@ -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