summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2009-12-30 16:30:44 +0100
committerAndreas Gruenbacher <agruen@suse.de>2009-12-30 16:30:44 +0100
commit018ff72892cdc02da1292ed6c1b79763d2d1ce33 (patch)
tree19538caf83240fa67f0a14dcba7dc7604fd800cf
parent9fef208ad7a2b1f19d65a3d734249284db2408e5 (diff)
downloadpatch-2.6.1.tar.gz
* NEWS: Version 2.6.1 released.v2.6.1
-rw-r--r--ChangeLog2
-rw-r--r--NEWS2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a7227ad..b552b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* patch.man: Clarify the description of the -F / --fuzz option.
+ * NEWS: Version 2.6.1 released.
+
2009-12-29 Andreas Gruenbacher <agruen@suse.de>
* src/patch.c (longopts, get_some_switches): Add an optional argument
diff --git a/NEWS b/NEWS
index a23bbb7..c2b2189 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Changes in version 2.6.1:
+
* Support for diff3(1) style merges which show the old, original, and new lines
of a conflict has been added (--merge=diff3). The default still is the
merge(1) format (--merge or --merge=merge).