comparison mercurial/cmdutil.py @ 3117:7a635ef25132

merge: simplify tests for local changed/remote deleted
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:18:27 -0500
parents eeaf9bcdfa25
children a33a9af1ec03
comparison
equal deleted inserted replaced
3116:920f54a2249e 3117:7a635ef25132