OSDN Git Service

Add conflict handle
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / ConflictEditorCommand.h
index 0436705..dd88eb9 100644 (file)
@@ -31,10 +31,7 @@ public:
        /**\r
         * Executes the command.\r
         */\r
-       virtual bool                    Execute()\r
-       {\r
-//             return SVNDiff::StartConflictEditor(cmdLinePath);\r
-       }\r
+       virtual bool                    Execute();\r
 };\r
 \r
 \r