diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb index 38020901..0d0b540e 100644 --- a/lib/gollum/frontend/app.rb +++ b/lib/gollum/frontend/app.rb @@ -97,6 +97,7 @@ module Precious @versions = [sha1, sha2] diffs = wiki.repo.diff(@versions.first, @versions.last, @page.path) @diff = diffs.first + @message = "The patch does not apply." mustache :compare end end diff --git a/lib/gollum/frontend/templates/compare.mustache b/lib/gollum/frontend/templates/compare.mustache index 50d051f0..1859ff7d 100755 --- a/lib/gollum/frontend/templates/compare.mustache +++ b/lib/gollum/frontend/templates/compare.mustache @@ -7,13 +7,20 @@
{{message}}
+{{/message}} +