From 018ff72892cdc02da1292ed6c1b79763d2d1ce33 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 30 Dec 2009 16:30:44 +0100 Subject: * NEWS: Version 2.6.1 released. --- ChangeLog | 2 ++ NEWS | 2 ++ 2 files changed, 4 insertions(+) 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 * 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). -- cgit v1.2.1