Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 6f9504c

Browse files
committed
RelNotes: am.threeWay does not exist (yet)
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 15dc5b5 commit 6f9504c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Documentation/RelNotes/2.5.0.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ UI, Workflows & Features
127127
* "git send-email" learned the alias file format used by the sendmail
128128
program (in a simplified form; we obviously do not feed pipes).
129129

130-
* "git am" learned am.threeWay configuration variable.
131-
132130
* Traditionally, external low-level 3-way merge drivers are expected
133131
to produce their results based solely on the contents of the three
134132
variants given in temporary files named by %O, %A and %B on their

0 commit comments

Comments
 (0)