From 95a6d965c556807a7aa16490f92f48b77bf8b6ce Mon Sep 17 00:00:00 2001
From: Øystein Walle <oystwa@gmail.com>
Date: Tue, 16 Sep 2014 10:28:11 +0200
Subject: 33180: _git: add missing --3way option

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1f17f5f26..6fe3be9a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 
 	* 33177: Completion/Unix/Command/_git: _git: fix typo in git-apply
 
+	* 33180: Completion/Unix/Command/_git: _git: add missing --3way
+	option
+
 2014-09-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: NEWS: more minor tweaks.
-- 
cgit 1.4.1