diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2016-11-14 13:25:20 -0800 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2016-11-14 13:25:20 -0800 |
| commit | a45cfee7a372b0cf3576dd339c040efeb65d5eeb (patch) | |
| tree | 9add3f250207f212c32fa7c8eb8476ec9efd462b /org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | |
| parent | 1c70dd6d219d2336b0d505739fe4c17677d5cc8c (diff) | |
| download | jgit-a45cfee7a372b0cf3576dd339c040efeb65d5eeb.tar.gz jgit-a45cfee7a372b0cf3576dd339c040efeb65d5eeb.zip | |
Organize imports
Change-Id: I7c545d06b1bced678c020fab9af1382bc4416b6e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index 485efc5428..1aab748a0c 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -49,8 +49,8 @@ import java.util.Map; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.MergeCommand; -import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.api.MergeCommand.FastForwardMode; +import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.api.errors.CheckoutConflictException; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; |