aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
diff options
context:
space:
mode:
authorTomasz Zarna <Tomasz.Zarna@pl.ibm.com>2012-03-05 12:59:10 +0100
committerTomasz Zarna <Tomasz.Zarna@pl.ibm.com>2012-03-05 12:59:10 +0100
commiteedd77a97b3eb5c404ac8464ea3a59498a121c72 (patch)
tree8add079921b41aae8b58197fe5a10030cc92198f /org.eclipse.jgit.test
parentc71fff4ce2dcd0667d5b1e470f9c34042f0a2cf4 (diff)
downloadjgit-eedd77a97b3eb5c404ac8464ea3a59498a121c72.tar.gz
jgit-eedd77a97b3eb5c404ac8464ea3a59498a121c72.zip
RawText#getEOL() does the same thing as RawText#getLineDelimiter()
The duplication has been introduced when merging I08e1369e142bb19f42a8d7bbb5a7d062cc8533fc and I18adc63596f4657516ccc6d704a561924c79d445. The former should have been manually rebased. It also missed a copyright update in ApplyCommandTest. Change-Id: I18fe6108220f964524fb16b719604222aa7abee6
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
index dceb0ec697..16c0a9b447 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011, 2012, Tomasz Zarna <Tomasz.Zarna@pl.ibm.com>
+ * Copyright (C) 2011, 2012, IBM Corporation and others.
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available