comparison mercurial/merge.py @ 25349:62da2d7745f9

commands: rename current to active in variables and comments Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.
author Ryan McElroy <rmcelroy@fb.com>
date Thu, 28 May 2015 20:06:19 -0700
parents 6eb4bdad198f
children 328739ea70c3
comparison
equal deleted inserted replaced
25348:f26efa4f0eff 25349:62da2d7745f9