+Version 0.6.1.0 version(internal)\r
+Features:\r
+ *TortoiseMerge Support git format patch file. \r
+ TortoiseMerge can open git patch file and review diff and merge change.\r
+\r
+ *SendMail support\r
+ Right click .patch or .diff file, click "send mail..." to send patch out.\r
+\r
+ *improve clone dialog\r
+ Add auto fill module name at directory when change URL. Fix tab order.\r
+\r
+ \r
+Fix:\r
+ Issue 73: Error while reading/writing the registry key MSysGit Access is denied\r
+ Issue 11: Show differences as unified diff does not use selected item\r
+ Issue 77: "Show differencess" against a deleted file will cause TortoiseMerge to error\r
+ Issue 74: Add multiple files from commit dialog only adds first two in multi-selection\r
+ Issue 75: About box does not show version information\r
+ Wrong error message when fail launch pageant\r
+ Setup will launch old version msi to remove old version. Directly update to new version without remove old version\r
+ Double click conflict item to launch diffview, not conflict edit.\r
+ Issue 66 in tortoisegit: Some log lines lose color or disappear after you click on them\r
+ \r
+\r
Version 0.5.1.0 version(internal)\r
Fix:\r
Issue 52: TortoiseMerge crashes on x64 \r
<Include Id="VersionNumberInclude">\r
<?define MajorVersion="0" ?>\r
<?define MinorVersion="6" ?>\r
- <?define MicroVersion="0" ?>\r
- <?define BuildVersion="1" ?>\r
+ <?define MicroVersion="1" ?>\r
+ <?define BuildVersion="0" ?>\r
</Include>\r
-#define FILEVER 0,6,0,0\r
-#define PRODUCTVER 0,6,0,0\r
-#define STRFILEVER "0, 6, 0, 0\0"\r
-#define STRPRODUCTVER "0, 6, 0, 0\0"\r
+#define FILEVER 0,6,1,0\r
+#define PRODUCTVER 0,6,1,0\r
+#define STRFILEVER "0, 6, 1, 0\0"\r
+#define STRPRODUCTVER "0, 6, 1, 0\0"\r
\r
#define TSVN_VERMAJOR 0\r
#define TSVN_VERMINOR 6\r
-#define TSVN_VERMICRO 0\r
+#define TSVN_VERMICRO 1\r
#define TSVN_VERBUILD 0\r
#define TSVN_VERDATE "date unknown\n"\r
\r