Mercurial > jhg

diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 249:4c3b9f679412

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecated HgLogCommand.FileRevision gone, top-level HgFileRevision is bright and shiny replacement
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 12 Aug 2011 18:58:16 +0200
parents 3fbfce107f94
children c6450b0b1fd5
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgMergeState.java	Fri Aug 12 18:48:57 2011 +0200
+++ b/src/org/tmatesoft/hg/repo/HgMergeState.java	Fri Aug 12 18:58:16 2011 +0200
@@ -27,7 +27,6 @@
 
 import org.tmatesoft.hg.core.HgBadStateException;
 import org.tmatesoft.hg.core.HgFileRevision;
-import org.tmatesoft.hg.core.HgLogCommand.FileRevision;
 import org.tmatesoft.hg.core.Nodeid;
 import org.tmatesoft.hg.internal.ManifestRevision;
 import org.tmatesoft.hg.internal.Pool;