testing/patch
SHA256
6
0
Fork 0
forked from pool/patch
Code Pull Requests Activity

Accepting request 27907 from devel:tools

Browse Source 
Copy from devel:tools/patch based on submit request 27907 from user agruen

OBS-URL: https://build.opensuse.org/request/show/27907
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patch?expand=0&rev=16
This commit is contained in:
OBS User autobuild
2010-01-08 16:31:55 +00:00
committed by Git OBS Bridge
parent 2ff96b8001
commit fc7cf49875
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patch.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Dec 30 17:14:24 CET 2009 - agruen@suse.de
- 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).
+ Bug and portability fixes.
-------------------------------------------------------------------
Sun Dec 6 17:32:57 CET 2009 - jengelh
- enable parallel building
-------------------------------------------------------------------
Fri Nov 13 15:45:06 CET 2009 - agruen@suse.de