diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-24 14:31:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 14:31:23 -0700 |
| commit | 6f9504c48ea59951a2aa3ee17e7c7fc36285e225 (patch) | |
| tree | d1f2e19df808b09206c87944a811c4ad3f617311 /Documentation/RelNotes/2.5.0.txt | |
| parent | Revert "git-am: add am.threeWay config variable" (diff) | |
| download | tgif-6f9504c48ea59951a2aa3ee17e7c7fc36285e225.tar.xz | |
RelNotes: am.threeWay does not exist (yet)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.5.0.txt')
| -rw-r--r-- | Documentation/RelNotes/2.5.0.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.txt index b516335f68..87044504c5 100644 --- 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 |