Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9565210D87 for ; Thu, 5 Sep 2013 15:11:18 +0000 (UTC) Received: (qmail 99346 invoked by uid 500); 5 Sep 2013 15:11:17 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 99299 invoked by uid 500); 5 Sep 2013 15:11:15 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 99272 invoked by uid 99); 5 Sep 2013 15:11:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Sep 2013 15:11:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24C43901491; Thu, 5 Sep 2013 15:11:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Thu, 05 Sep 2013 15:11:14 -0000 Message-Id: <6b569802e6354a9a9c3c2fe089d3526b@git.apache.org> In-Reply-To: <9897bb36aa7c4da384d5f0b5691f4d1d@git.apache.org> References: <9897bb36aa7c4da384d5f0b5691f4d1d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: [#6229] add merge commit to test data [#6229] add merge commit to test data Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/39b6d205 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/39b6d205 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/39b6d205 Branch: refs/heads/db/6629 Commit: 39b6d205dafd241b9105c258d4ca404b905f4c4f Parents: 562b3f3 Author: Dave Brondsema Authored: Thu Sep 5 14:55:31 2013 +0000 Committer: Dave Brondsema Committed: Thu Sep 5 14:55:31 2013 +0000 ---------------------------------------------------------------------- .../objects/13/951944969cf45a701bf90f83647b309815e6d5 | 2 ++ .../objects/65/3667b582ef2950c1954a0c7e1e8797b19d778a | 3 +++ .../objects/6b/0bbf7169927069f7839b682307ec4ecb85c2e9 | Bin 0 -> 56 bytes .../objects/d4/99ed2dc5606d4d0953937bca92157743df79ab | Bin 0 -> 77 bytes .../tests/data/testrename.git/refs/heads/master | 2 +- 5 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/39b6d205/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5 ---------------------------------------------------------------------- diff --git a/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5 b/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5 new file mode 100644 index 0000000..49fdaba --- /dev/null +++ b/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5 @@ -0,0 +1,2 @@ +x���JA �=�S�A�?��C����`oKO��; {�SQ|�[�L�)��a��L�J.�hRG9R�*L�g�uC�|�널IU����ȫ���\$%��y+���_r,k^�m��O9�4o+VO����_�������Wݭ1