]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4aee3e1) | patch
browser: first cut at horizontal split.
authorNeil Brown <neilb@suse.de>
Sun, 4 Apr 2010 06:07:41 +0000 (16:07 +1000)
committerNeil Brown <neilb@suse.de>
Sun, 4 Apr 2010 06:07:41 +0000 (16:07 +1000)
commit93be98974599e0ba1735810f411c8e86bb325443
tree7bf0c8496e35608fd13b1ac1747042a8427e01d8tree | snapshot
parent4aee3e11dfdf2579451c06dd6ff449c0db08b229commit | diff
browser: first cut at horizontal split.

When in 'merge' mode we display the patch in a bottom window when on a
conflict or wiggle, so full context can be see.

This is a bit rough at the moment - the image jumps more than I would
like and it is hard to visually follow what is happening.

Signed-off-by: NeilBrown <neilb@suse.de>
vpatch.c diff | blob | history
apply rejected patches and perform word-wise diffs