From 6198f7ffbae48230561fdd6996358fd553d954db Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Sat, 31 Oct 2015 12:52:46 +0000
Subject: 37031: _git-merge: Exclude ancestors of HEAD from recent commit
 completion

As done for _git-cherry-pick in a428c6b62cb2 (36328 + 36340).
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index f314e82f4..9fd23ada9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-11-13  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 37031: Completion/Unix/Command/_git: _git-merge: Exclude
+	ancestors of HEAD from recent commit completion
+
 	* 37025: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
 	vcs_info git: Add a cherry-pick patch-format
 
-- 
cgit 1.4.1