--- a/changelog	Sat Feb 01 17:16:45 2014 +0100
+++ b/changelog	Sat Feb 01 17:47:46 2014 +0100
@@ -16,6 +16,8 @@
          tagging of a specific revision
      --- added dialogs to enter the contents for initial .hgrc/mercurial.ini
          and .hg/hgrc files
+     --- added a configuration option to enforce the useage of the internal
+         merge tool
 
 Version 5.4.0:
 - bug fixes