diff options
| author | Micah Anderson <micah@riseup.net> | 2016-11-04 10:54:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2016-11-04 10:54:28 -0400 |
| commit | 34a381efa8f6295080c843f86bfa07d4e41056af (patch) | |
| tree | 9282cf5d4c876688602705a7fa0002bc4a810bde /puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt | |
| parent | 0a72bc6fd292bf9367b314fcb0347c4d35042f16 (diff) | |
| parent | 5821964ff7e16ca7aa9141bd09a77d355db492a9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt')
| m--------- | puppet/modules/vcsrepo | 0 | ||||
| -rw-r--r-- | puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/puppet/modules/vcsrepo b/puppet/modules/vcsrepo deleted file mode 160000 -Subproject 4e23209eaccf1ab504d35158f4141b3053327c2 diff --git a/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt b/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt new file mode 100644 index 00000000..46173df4 --- /dev/null +++ b/puppet/modules/vcsrepo/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 |