summaryrefslogtreecommitdiffstats
path: root/quilt.changes
diff options
context:
space:
mode:
Diffstat (limited to 'quilt.changes')
-rw-r--r--quilt.changes6
1 files changed, 6 insertions, 0 deletions
diff --git a/quilt.changes b/quilt.changes
index 76ed1fe..6d10ac5 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 27 13:39:06 CET 2010 - bert.wesarg@googlemail.com
+
+- quilt/push.in: patch's --merge option has an optional argument
+ now.
+
+-------------------------------------------------------------------
Wed Jan 27 13:38:02 CET 2010 - hertzog@debian.org
- quilt/scripts/patchfns.in: Skip non-files when selecting the