]>
git.neil.brown.name Git - wiggle.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Neil Brown [Sat, 3 Jun 2006 09:16:52 +0000 (09:16 +0000)]
Fix bug where first line always displayed as a blank.
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Sat, 3 Jun 2006 02:06:48 +0000 (02:06 +0000)]
Movement commands for top and bottom
ESC < or 0G for top
ESC > or G for bottom
Some number-prefix stuff too.
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Sat, 3 Jun 2006 01:36:02 +0000 (01:36 +0000)]
Blank screen after end of file and before beginning.
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Sat, 3 Jun 2006 01:28:51 +0000 (01:28 +0000)]
Add todo file
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Sat, 3 Jun 2006 01:28:05 +0000 (01:28 +0000)]
Adequate viewing of merged diffs now.
Displays + and - lines as appropriate and can
be positioned on any line.
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Fri, 2 Jun 2006 13:39:34 +0000 (13:39 +0000)]
Beginning of handling of grouped diffs.
i.e. if there are some '-' and some '+' lines together,
then all the '-' come first, followed by all the '+',
rather than intermingling them.
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Fri, 9 Jun 2006 07:10:55 +0000 (07:10 +0000)]
Remove all trailing blanks.
There are quite a few...
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Mon, 29 May 2006 10:42:57 +0000 (10:42 +0000)]
Improvements to brower mode.
While still simplistic, it now displays deletes and inserts
on different lines, so each file line can be 1 or 2
screen lines.
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Thu, 25 May 2006 11:08:57 +0000 (11:08 +0000)]
Remove support for the name 'vpatch'
Apparently it is otherwise used:
http://www.tibed.net/index.php?page=vpatch
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Thu, 25 May 2006 10:59:57 +0000 (10:59 +0000)]
Get merge2 to pass all the tests...
Some of this done by changing tests...
Signed-off-by: Neil Brown <neilb@suse.de>
Neil Brown [Fri, 9 Jun 2006 07:05:42 +0000 (17:05 +1000)]
Add tests/linux/idmap.h
I must have missed it before.
Neil Brown [Sun, 21 May 2006 23:51:00 +0000 (09:51 +1000)]
Fix a couple of signed/unsigned warnings
(cherry picked from
80e90ff5842fb2b382efe8768f441ddbdca5300e commit)
Neil Brown [Sun, 21 May 2006 23:46:32 +0000 (09:46 +1000)]
Add new patch-browsing mode - needs a lot of work.
(cherry picked from
0b29f4153dbe34b164e2636066c19d2c383e17e4 commit)
Neil Brown [Sun, 21 May 2006 23:34:17 +0000 (09:34 +1000)]
Still more updates to 'p'
Neil Brown [Sun, 21 May 2006 23:33:29 +0000 (09:33 +1000)]
Cope if 'best' doesn't find anything any good.
Neil Brown [Sun, 21 May 2006 23:32:24 +0000 (09:32 +1000)]
More updates to 'p'
Neil Brown [Sun, 21 May 2006 23:20:25 +0000 (09:20 +1000)]
Assorted fixes and enhancements...
Neil Brown [Sun, 21 May 2006 23:18:15 +0000 (09:18 +1000)]
Various enhancements to 'p'
Neil Brown [Sun, 21 May 2006 23:17:49 +0000 (09:17 +1000)]
Fix off-by-one-error when extracting a merge file.
If a merge ended at EOF, --extract wouldn't interpret it properly.
Neil Brown [Sun, 21 May 2006 23:17:06 +0000 (09:17 +1000)]
Add recommit option to 'p'
Neil Brown [Sun, 21 May 2006 23:16:47 +0000 (09:16 +1000)]
Add wiggle.spec and fix typos in ANNOUNCE
Neil Brown [Sun, 21 May 2006 23:15:34 +0000 (09:15 +1000)]
Remove usage of debian-specific --quiet flag to /usr/bin/time
Neil Brown [Sun, 21 May 2006 23:13:49 +0000 (09:13 +1000)]
Wiggle 0.6 - first release