comparison hgmerge @ 4149:e59286f15189

Use "f in dirstate" instead of "dirstate.state(f) == '?'"
author Emanuele Aina <faina.mail@tiscali.it>
date Tue, 06 Mar 2007 17:45:43 -0300
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
4148:de85ff0aaac5 4149:e59286f15189