summaryrefslogtreecommitdiff
path: root/spec/fixtures/hg_parents.txt
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-05-24 10:19:38 -0400
committerMicah <micah@leap.se>2016-05-24 10:19:38 -0400
commit92a1ac5b29b497ee659c8097a5c0de94a481181c (patch)
treee9c325ad24a732b6bdb13801ef2997f10f99e02e /spec/fixtures/hg_parents.txt
Squashed 'puppet/modules/vcsrepo/' content from commit 4e23209
git-subtree-dir: puppet/modules/vcsrepo git-subtree-split: 4e23209eaccf1ab504d35158f4141b3053327c2f
Diffstat (limited to 'spec/fixtures/hg_parents.txt')
-rw-r--r--spec/fixtures/hg_parents.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/fixtures/hg_parents.txt b/spec/fixtures/hg_parents.txt
new file mode 100644
index 00000000..46173df4
--- /dev/null
+++ b/spec/fixtures/hg_parents.txt
@@ -0,0 +1,6 @@
+changeset: 3:34e6012c783a
+parent: 2:21ea4598c962
+parent: 1:9d0ff0028458
+user: Test User <test.user@example.com>
+date: Fri Aug 07 13:13:02 2009 -0400
+summary: merge