diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-04-02 15:57:11 +0400 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-04-14 18:16:22 +0400 |
| commit | 103b7d21226e43192cf138ecf0b98b51796ae0ed (patch) | |
| tree | 46df8289f3b0399a8dfd38f02530c0edc0c0b3e4 /tests/resources/cherrypick/.gitted/refs | |
| parent | 4d7b993904008001ad995d6b27af0e8c71277c55 (diff) | |
Added cherry pick tests
Diffstat (limited to 'tests/resources/cherrypick/.gitted/refs')
7 files changed, 7 insertions, 0 deletions
diff --git a/tests/resources/cherrypick/.gitted/refs/heads/automerge-branch b/tests/resources/cherrypick/.gitted/refs/heads/automerge-branch new file mode 100644 index 000000000..9330ef3d1 --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/automerge-branch @@ -0,0 +1 @@ +d3d77487660ee3c0194ee01dc5eaf478782b1c7e diff --git a/tests/resources/cherrypick/.gitted/refs/heads/master b/tests/resources/cherrypick/.gitted/refs/heads/master new file mode 100644 index 000000000..aa8913beb --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/master @@ -0,0 +1 @@ +2a26c7e88b285613b302ba76712bc998863f3cbc diff --git a/tests/resources/cherrypick/.gitted/refs/heads/merge-branch b/tests/resources/cherrypick/.gitted/refs/heads/merge-branch new file mode 100644 index 000000000..ea5b277ec --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/merge-branch @@ -0,0 +1 @@ +abe4603bc7cd5b8167a267e0e2418fd2348f8cff diff --git a/tests/resources/cherrypick/.gitted/refs/heads/merge-conflicts b/tests/resources/cherrypick/.gitted/refs/heads/merge-conflicts new file mode 100644 index 000000000..f63f17efb --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/merge-conflicts @@ -0,0 +1 @@ +bafbf6912c09505ac60575cd43d3f2aba3bd84d8 diff --git a/tests/resources/cherrypick/.gitted/refs/heads/merge-mainline b/tests/resources/cherrypick/.gitted/refs/heads/merge-mainline new file mode 100644 index 000000000..0ec5e458c --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/merge-mainline @@ -0,0 +1 @@ +cfc4f0999a8367568e049af4f72e452d40828a15 diff --git a/tests/resources/cherrypick/.gitted/refs/heads/orphan b/tests/resources/cherrypick/.gitted/refs/heads/orphan new file mode 100644 index 000000000..f4d6a7467 --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/orphan @@ -0,0 +1 @@ +74f06b5bfec6d33d7264f73606b57a7c0b963819 diff --git a/tests/resources/cherrypick/.gitted/refs/heads/renames b/tests/resources/cherrypick/.gitted/refs/heads/renames new file mode 100644 index 000000000..df5587173 --- /dev/null +++ b/tests/resources/cherrypick/.gitted/refs/heads/renames @@ -0,0 +1 @@ +44cd2ed2052c9c68f9a439d208e9614dc2a55c70 |