diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-03-14 16:58:24 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-03-14 16:58:24 +0400 |
| commit | cc59ff1c5eeb0062ce3383a9e28351595f82b735 (patch) | |
| tree | d64c7bfb607987e658a13b339cc899acd2f21436 /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git | |
| parent | 460d28caae43fe31989c752573c6327914cfbefe (diff) | |
| parent | 8857b817e97eb5379d6423d98f321fd78630aee8 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/core/Mono.Texteditor/Mono.TextEditor.csproj
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl.Git')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs index 46624ac087..8ac86aa9fd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs @@ -857,7 +857,7 @@ namespace MonoDevelop.VersionControl.Git string GetCommitTextContent (RevCommit c, FilePath file) { - return NGit.Util.RawParseUtils.Decode (GetCommitContent (c, file)); + return Mono.TextEditor.Utils.TextFileReader.GetText (GetCommitContent (c, file)); } string GenerateDiff (byte[] data1, byte[] data2) |