OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15dc5b5
)
RelNotes: am.threeWay does not exist (yet)
author
Junio C Hamano
<gitster@pobox.com>
Fri, 24 Jul 2015 21:31:23 +0000
(14:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 24 Jul 2015 21:31:23 +0000
(14:31 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/2.5.0.txt
patch
|
blob
|
history
diff --git
a/Documentation/RelNotes/2.5.0.txt
b/Documentation/RelNotes/2.5.0.txt
index
b516335
..
8704450
100644
(file)
--- a/
Documentation/RelNotes/2.5.0.txt
+++ b/
Documentation/RelNotes/2.5.0.txt
@@
-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