diff options
Diffstat (limited to 'docs/RelNotes/3.4.0.org')
| -rw-r--r-- | docs/RelNotes/3.4.0.org | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/RelNotes/3.4.0.org b/docs/RelNotes/3.4.0.org index cc0c0aa..5021c97 100644 --- a/docs/RelNotes/3.4.0.org +++ b/docs/RelNotes/3.4.0.org @@ -48,3 +48,6 @@ - ~magit-discard~ didn't properly handle conflicts resulting from a file being renamed on both sides. #4225 + +- Since v3.0.0, ~magit-pull-from-pushremote~ has failed on + non-fast-forward merges. #4604 |