1 files changed, 39 insertions, 0 deletions
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 0bbe1b3..a17ccd2 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1288,18 +1288,44 @@ Please inform us about your distribution so we can list it, everypony can see it
 @cindex versions
 @cindex previous releases
 
+@heading Version 2.4
+
+@item
+New ponies: @code{blaze}
+@end itemize
+
 @heading Version 2.3
 
 @itemize @bullet
 @item
+<<<<<<< HEAD
+Support for 'best.pony' file.
+@item
+`-q` accepts file names.
+=======
 Support for @file{best.pony} file.
 @item
 @option{-q} accepts file names.
+>>>>>>> 4fcd0b284ff296b41e08056c2dbf35de614e0320
 @item
 Improved Unicode support: treats combining characters as invisible.
 @item
 Optional support for UCS pony names.
 @item
+<<<<<<< HEAD
+Pony files and balloon style files can be pipes (as
+well as sockets, doors and as always regular files.)
+@item
+Support cowsay style message compression.
+@itemize @bullet
+@item @code{pinkieoink} → @code{oinkoinkoink}
+@end itemize
+@item
+Support for non-MLP:FiM ponies (known as extraponies),
+although the directory is currently empty.
+@end itemize
+
+=======
 Pony files and balloon style files can be pipes (as well as sockets, doors
 and as always regular files.)
 @item
@@ -1319,12 +1345,24 @@ corresponding to @option{-f}, @option{-l}, and @option{-L}.
 @end itemize
 
 
+>>>>>>> 4fcd0b284ff296b41e08056c2dbf35de614e0320
 @heading Version 2.2
 
 @itemize @bullet
 @item
 Full support for arbitrary positioning of balloon in pony files.
 @item
+<<<<<<< HEAD
+ANSI colour sequences in pony files are	applied	only to	the pony image,
+not the	balloon	link or	the balloon itself.
+@item
+Support for colours in the message.
+@item
+Support	custom balloon styles using the	option '-b', '-B' will list all
+available. This list depends on whether you are invoking `ponysay` or `ponythink`.
+@end itemize
+
+=======
 ANSI colour sequences in pony files are applied only to the pony image,
 not the balloon link or the balloon itself.
 @item
@@ -1335,6 +1373,7 @@ all available. This list depends on whether you are invoking @command{ponysay}
 @end itemize
 
 
+>>>>>>> 4fcd0b284ff296b41e08056c2dbf35de614e0320
 @heading Version 2.1.1
 
 Nothing worth mention.