Git: git diff show changes, but merge says up to date?

So I have two branches: master and other. I merged other branch into master, but for some reason source for one commit have not changed.

I can see those commits in master by ruing git log, but actual source code have not changed. In other branch it has new changes, but master does not.

So ruing:

git diff master..other dir_name

Shows me this:

--- a/dir_name/views/purchase_order_report.xml
+++ b/dir_name/views/purchase_order_report.xml
@@ -60,9 +60,9 @@
                     <span t-field="o.partner_id.name"/>
                     <div t-field="o.partner_id"
                         t-field-options='{"widget": "contact", "fields": ["address"], "no_marker": true}'/>
-                    <t t-if="o.partner_id.child_ids.search([('type', '=', 'invoice')])">
+                    <t t-if="o.partner_id.child_ids.filtered(lambda r: r.type == 'invoice')">
                         <span>Attn: 
-                            <span t-esc="o.partner_id.child_ids.search([('type', '=', 'invoice')])[0].name"/>
+                            <span t-esc="o.partner_id.child_ids.filtered(lambda r: r.type == 'invoice')[0].name"/>
                         </span>
                     </t>
                 </div>

+ lines are the ones that should be in master too, but are not for some reason.

And doing:

git checkout master
git merge other
Already up-to-date.

So it seems something is messed up.