diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
| commit | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (patch) | |
| tree | 2f4cc6d69645bd460aa253fdecb606d764fbd25d /plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java | |
| parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
| download | idea-1aa2e09bdbd413eacb677e9fa4b50630530d0656.tar.gz | |
Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git
Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
Diffstat (limited to 'plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java')
| -rw-r--r-- | plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java b/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java index 29072ea53940..bdf87b265427 100644 --- a/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java +++ b/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java @@ -38,9 +38,9 @@ import java.io.File; import java.io.IOException; import java.util.*; +import static com.intellij.dvcs.DvcsUtil.getShortHash; import static com.intellij.openapi.vcs.Executor.overwrite; import static com.intellij.openapi.vcs.Executor.touch; -import static git4idea.GitUtil.getShortHash; import static git4idea.test.GitExecutor.*; import static git4idea.test.GitTestUtil.USER_EMAIL; import static git4idea.test.GitTestUtil.USER_NAME; |