changeset:   3:652c87bd2e18
tag:         tip
parent:      0:9423171a5403
parent:      2:ad30688f99b3
user:        Juuso Lapinlampi <wubthecaptain@gmail.com>
date:        Mon Oct 30 05:06:03 2017 +0000
summary:     merge commit

diff -r 9423171a5403 -r 652c87bd2e18 foo.txt
--- a/foo.txt   Mon Oct 30 05:04:36 2017 +0000
+++ b/foo.txt   Mon Oct 30 05:06:03 2017 +0000
@@ -1,1 +1,1 @@
-hello
+hello world!

changeset:   2:ad30688f99b3
branch:      feature-1
user:        Juuso Lapinlampi <wubthecaptain@gmail.com>
date:        Mon Oct 30 05:05:40 2017 +0000
summary:     added exclamation mark

diff -r 2c93680f2e3c -r ad30688f99b3 foo.txt
--- a/foo.txt   Mon Oct 30 05:05:20 2017 +0000
+++ b/foo.txt   Mon Oct 30 05:05:40 2017 +0000
@@ -1,1 +1,1 @@
-hello world
+hello world!

changeset:   1:2c93680f2e3c
branch:      feature-1
user:        Juuso Lapinlampi <wubthecaptain@gmail.com>
date:        Mon Oct 30 05:05:20 2017 +0000
summary:     added "world" to hello world

diff -r 9423171a5403 -r 2c93680f2e3c foo.txt
--- a/foo.txt   Mon Oct 30 05:04:36 2017 +0000
+++ b/foo.txt   Mon Oct 30 05:05:20 2017 +0000
@@ -1,1 +1,1 @@
-hello
+hello world

changeset:   0:9423171a5403
user:        Juuso Lapinlampi <wubthecaptain@gmail.com>
date:        Mon Oct 30 05:04:36 2017 +0000
summary:     hello world

diff -r 000000000000 -r 9423171a5403 foo.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/foo.txt   Mon Oct 30 05:04:36 2017 +0000
@@ -0,0 +1,1 @@
+hello