56091854 (2013-06-10 16:24:16,014) [main] INFO              q.action  - Performing 'conflictSolver, Conflict Solver, Allows to visually resolve conflicts in conflict files after a merge.' menu item from context menu in window org.eclipse.swt.widgets.Shell@1E3EBA1:Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}
56091868 (2013-06-10 16:24:16,028) [WorkerThread-2] INFO            sg.command  - Conflict Solver [d:\Photon\ExitGames-Photon-Server-SDK_v3-2-10-4248\src-server\Tanks(currentBranch=default;headRevision=21)] /lib/protobuf-net.dll
56092158 (2013-06-10 16:24:16,318) [WorkerThread-2] ERROR           sg.command  - D:\Temp\smartgit5959681644939157712tmp\compare__797302718696258079_protobuf-net.dll seems to be a binary file.
smartgit.dr: D:\Temp\smartgit5959681644939157712tmp\compare__797302718696258079_protobuf-net.dll seems to be a binary file.
	at smartgit.qm.a(SourceFile:62)
	at smartgit.qm.a(SourceFile:26)
	at smartgit.bm.a(SourceFile:33)
	at smartgit.br.a(SourceFile:42)
	at smartgit.hU.run(SourceFile:112)
	at smartgit.QC.run(SourceFile:53)
Caused by: smartgit.aeI: D:\Temp\smartgit5959681644939157712tmp\compare__797302718696258079_protobuf-net.dll seems to be a binary file.
	at smartgit.aeH.a(SourceFile:51)
	at smartgit.da.a(SourceFile:163)
	at smartgit.qm.a(SourceFile:59)
	... 5 more
56092158 (2013-06-10 16:24:16,318) [main] INFO             q.dialogs  - Show (warn): Command Failed - Executing a command has failed.
56092173 (2013-06-10 16:24:16,333) [main] INFO              q.dialog  - Showing dialog 26 (@9B4B1F) '@1612129 - Command Failed' (owner: @1E3EBA1)
56092179 (2013-06-10 16:24:16,339) [main] INFO     q.dialogDisplayer  - Showing parent modal dialog 'Command Failed' on top of 'org.eclipse.swt.widgets.Shell@1E3EBA1:Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}'
original frame: org.eclipse.swt.widgets.Shell@9B4B1F:Shell {Command Failed}
56092181 (2013-06-10 16:24:16,341) [main] INFO  q.swt.shellActivation  - shell deactivated Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}@1E3EBA1
56092181 (2013-06-10 16:24:16,341) [main] INFO  q.swt.shellActivation  - shell activated Shell {Command Failed}@9B4B1F
56092181 (2013-06-10 16:24:16,341) [main] INFO  q.swt.shellActivation  - Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}@1E3EBA1   --->   Shell {Command Failed}@9B4B1F
56094330 (2013-06-10 16:24:18,490) [main] INFO              q.action  - Performing 'OK' button in window @9B4B1F owner @1E3EBA1
56094341 (2013-06-10 16:24:18,501) [main] INFO  q.swt.shellActivation  - shell activated Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}@1E3EBA1
56094341 (2013-06-10 16:24:18,501) [main] INFO  q.swt.shellActivation  - Shell {*Disposed*}@9B4B1F   --->   Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}@1E3EBA1
56094348 (2013-06-10 16:24:18,508) [main] INFO              q.dialog  - Showed dialog 26 (@9B4B1F) '@1612129 - Command Failed' (owner: @1E3EBA1)
56094785 (2013-06-10 16:24:18,945) [main] INFO  q.swt.shellActivation  - shell deactivated Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}@1E3EBA1
56094832 (2013-06-10 16:24:18,992) [main] INFO  q.swt.shellActivation  - Shell {Tanks - SmartGit/Hg 4.0.1 (for non-commercial use only)}@1E3EBA1   --->   null