1
2This is demo file for wiggles --browse mode.
3
4Browse mode is intended to let you look through a patch
5to see how it will apply to a set of files.  It is
6possible that the patch will have some conflicts.
7i.e. the patch was created from a different version of
8the source to the version that you are applying the patch
9to.  This is what makes it interesting.
10
11You can use normal cursor motion to scroll around,
12both vertially and horizontally.
13From the initial file-list patch, use space
14or <return> to open/close a directory or file.
15Form the file-view mode, use 'q' to get back to
16to file list.
17
18Differences applied by the patch are shown as
19RED for removal and BLUE for addition.
20Text with a pink background was not matched -
21maybe it has been changed since the patch was
22created.
23
24green-background text is text that the patch wants
25to change, but the exact correct change has already
26been made.
27
28Captial-N might go to the next interesting chunk
29of the file.
30
31
32---------------------------------------
33This demonstrates where a diff on one line
34applies to text that is now split
35
36The swift brown fox jumps over the lazy dog.
37
38------------
39
40This demonstrates a diff which contains some
41extraneous lines.
42(this is an extra line)
43
44The swift brown she
45fox jumps over the lazy dog.
46
47There will be extra lines in the diff
48(as is this)
49
50--------------
51
52Here are some lines
53without the least sign of
54a clear conflict
55
56--------------
57
58Two different lines,
59both with changes
60
61