mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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 * "git send-email" learned the alias file format used by the sendmail
program (in a simplified form; we obviously do not feed pipes). 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 * Traditionally, external low-level 3-way merge drivers are expected
to produce their results based solely on the contents of the three 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 variants given in temporary files named by %O, %A and %B on their