# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1449503542 0
# Node ID 80be9ec7656dac2388d6c87ab2e7786f52783d75
# Parent  1d8370c9bf7f6c474d9bebf48cf55e9063667d2e# Parent  7ec49c438c416f59c80d50b26eca63bc52444d8c
Merge.

diff -r 7ec49c438c41 -r 80be9ec7656d autoload/gundo.py
--- a/autoload/gundo.py	Wed Aug 27 13:13:45 2014 -0700
+++ b/autoload/gundo.py	Mon Dec 07 15:52:22 2015 +0000
@@ -361,7 +361,7 @@
 
         before_name = 'Original'
         before_time = ''
-        after_name = node_after.n
+        after_name = str(node_after.n)
         after_time = _fmt_time(node_after.time)
     else:
         _undo_to(node_before.n)
@@ -370,9 +370,9 @@
         _undo_to(node_after.n)
         after_lines = vim.current.buffer[:]
 
-        before_name = node_before.n
+        before_name = str(node_before.n)
         before_time = _fmt_time(node_before.time)
-        after_name = node_after.n
+        after_name = str(node_after.n)
         after_time = _fmt_time(node_after.time)
 
     _undo_to(current)
@@ -390,9 +390,9 @@
     _undo_to(node_after.n)
     after_lines = vim.current.buffer[:]
 
-    before_name = node_before.n or 'Original'
+    before_name = str(node_before.n or 'Original')
     before_time = node_before.time and _fmt_time(node_before.time) or ''
-    after_name = node_after.n or 'Original'
+    after_name = str(node_after.n or 'Original')
     after_time = node_after.time and _fmt_time(node_after.time) or ''
 
     _undo_to(current)