From: Barak A. Pearlmutter <barak+git@cs.nuim.ie>
Date: Sun, 19 Feb 2012 03:29:07 +0000 (+1100)
Subject: ChangeLog-typo
X-Git-Tag: v0.9~51
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=7ed3283bbd83b15fecc629f5699233950990fc4a;p=wiggle.git

ChangeLog-typo

option --quite should read --quiet
---

diff --git a/ChangeLog b/ChangeLog
index eddb566..8337da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
 
-	- Don't use --quite in dotest as it is a Debian specific extension
+	- Don't use --quiet in dotest as it is a Debian specific extension
 	  to /usr/bin/time
-	
\ No newline at end of file
+
diff --git a/TODO b/TODO
index 285929c..e65f734 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,17 @@
+- --no-wiggle mode does line-mode merge, but for any conflict it adds
+  a section to show what the wiggle would have looked like
+  <<<<
+  I found this
+  |||||
+  but wanted this
+  ====
+  and would replace it with this
+  &&&&
+  and my best guess is this.
+  >>>>
+
+  best guess only included if there is one.
+
 - search show go to right column and highlight
 - do we always recenter top when we split - what if near but not at bottom
 - side-by-side sometimes shows last line of a chunk with