Mercurial > evolve

diff CHANGELOG @ 3657:b36e38e3a176

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add test demonstarting issue5833 is fixed Previous patch which fixed issue5832 also fixed issue5833 as the root cause for both was same. This patch adds test of issue5833 as well. CHANEGLOG entry is also added for the fixed issues.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 06 Apr 2018 20:00:43 +0530
parents 23e515ca0143
children f018656ca3bf
line wrap: on
line diff
--- a/CHANGELOG	Fri Apr 06 20:13:27 2018 +0530
+++ b/CHANGELOG	Fri Apr 06 20:00:43 2018 +0530
@@ -15,7 +15,8 @@
   * templatekw: remove `obsfatedata` templatekw. Individuals fields are
     available in core as single template functions.
 
->>>>>>> source: 35349a1debab stable - boris: templatekw: remove obsfatedata t...
+  * fixed issue 5833 and 5832
+
 7.3.0 -- 2018-03-21
 ---------------------