X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=src%2FTortoiseProc%2FCommands%2FConflictEditorCommand.h;h=dd88eb9f3926818d9256909a5427c1dbbdea804f;hb=5c423fd2c3a69c9f6775fe321f747c2299764a19;hp=0436705a4e839d69dad69b6cfe95e8c6919de483;hpb=f1816999a44ea2c0c8404fbeb7badf20a49cebc4;p=tortoisegit%2FTortoiseGitJp.git

diff --git a/src/TortoiseProc/Commands/ConflictEditorCommand.h b/src/TortoiseProc/Commands/ConflictEditorCommand.h
index 0436705..dd88eb9 100644
--- a/src/TortoiseProc/Commands/ConflictEditorCommand.h
+++ b/src/TortoiseProc/Commands/ConflictEditorCommand.h
@@ -31,10 +31,7 @@ public:
 	/**
 	 * Executes the command.
 	 */
-	virtual bool			Execute()
-	{
-//		return SVNDiff::StartConflictEditor(cmdLinePath);
-	}
+	virtual bool			Execute();
 };