Mercurial > hg
comparison mercurial/diffhelper.py @ 47726:8e2e8d0a9a56
mergestate: use `update_file` to handle for `ACTION_ADD_MODIFIED`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11168
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 19 Jul 2021 05:44:57 +0200 |
parents | d4ba4d51f85f |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
47725:1f3a87a7a9b1 | 47726:8e2e8d0a9a56 |
---|