about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bb2d507c2..05d6999ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-05  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36410: Doc/Zsh/contrib.yo
+	Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git:
+	Present merge heads as patches
+
 2015-09-04  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 36421: Src/pattern.c: can't-get-the-staff fix for idiocy in