# # # patch "src/model/ContentDiff.cpp" # from [bada10adf7a568d973c1d80cd5ddfb432e979a83] # to [205b1f9f078f60072838a5e185c57a3c79dcb283] # ============================================================ --- src/model/ContentDiff.cpp bada10adf7a568d973c1d80cd5ddfb432e979a83 +++ src/model/ContentDiff.cpp 205b1f9f078f60072838a5e185c57a3c79dcb283 @@ -45,7 +45,10 @@ void ContentDiff::readDatabaseDiff(const const QString & base, const QString & target, const QString & enc) { - encoding = enc; + if (enc.isEmpty()) + encoding = "UTF-8"; + else + encoding = enc; QStringList cmd; cmd << "content_diff"; @@ -79,7 +82,10 @@ void ContentDiff::readWorkspaceDiff(cons const QString & base, const QString & target, const QString & enc) { - encoding = enc; + if (enc.isEmpty()) + encoding = "UTF-8"; + else + encoding = enc; QStringList cmd; cmd << "content_diff";