diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2009-12-30 16:30:44 +0100 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2009-12-30 16:30:44 +0100 |
commit | 018ff72892cdc02da1292ed6c1b79763d2d1ce33 (patch) | |
tree | 19538caf83240fa67f0a14dcba7dc7604fd800cf | |
parent | 9fef208ad7a2b1f19d65a3d734249284db2408e5 (diff) | |
download | patch-2.6.1.tar.gz |
* NEWS: Version 2.6.1 released.v2.6.1
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | NEWS | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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 @@ -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). |