comparison mercurial/merge.py @ 34636:31c6c4d27be7

exewrapper: format with clang-format A few *s move around, some spaces around parens, a couple of braces. Nothing remarkable. Differential Revision: https://phab.mercurial-scm.org/D1032
author Augie Fackler <augie@google.com>
date Wed, 04 Oct 2017 11:04:18 -0400
parents 1248aa48cac9
children c0a524f77e8a
comparison
equal deleted inserted replaced
34635:3455e2e2ce9b 34636:31c6c4d27be7