--- a/timeformat.diff	Fri Mar 04 15:57:04 2016 +0200
+++ b/timeformat.diff	Fri Dec 09 02:12:34 2016 +0200
@@ -1,5 +1,6 @@
 # HG changeset patch
 # Parent 66f6d14c851bd0280966a8263ff4119588775620
+# Parent  b31541d59f2a96959b96c7c4454d3da15a33addd
 [experimental] Allow user to modify time formatting
 
   * give user full control and full responsibility
@@ -9,9 +10,9 @@
     * time_prefix_len (normal prefix width + 5)
   * fall back to 0, if any of these unset
 
-diff -r 66f6d14c851b mcabber/mcabber/screen.c
---- a/mcabber/mcabber/screen.c	Tue Nov 11 23:42:00 2014 +0200
-+++ b/mcabber/mcabber/screen.c	Tue Nov 11 23:43:05 2014 +0200
+diff -r b31541d59f2a mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c	Fri Dec 09 01:38:46 2016 +0200
++++ b/mcabber/mcabber/screen.c	Fri Dec 09 01:48:18 2016 +0200
 @@ -85,6 +85,7 @@
  static void scr_end_current_completion(void);
  static void scr_insert_text(const char*);
@@ -20,7 +21,7 @@
  
  static void scr_glog_print(const gchar *log_domain, GLogLevelFlags log_level,
                             const gchar *message, gpointer user_data);
-@@ -222,8 +223,6 @@
+@@ -229,8 +230,6 @@
  
  /* Functions */
  
@@ -29,7 +30,7 @@
  static int find_color(const char *name)
  {
    int result;
-@@ -875,38 +874,100 @@
+@@ -878,38 +877,100 @@
  static const char *timeprefixes[] = {
    "%m-%d %H:%M ",
    "%H:%M ",