Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hgmerge.1.txt @ 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 | 345bac2bc4ec |
| children | 63b9d2deed48 |
comparison
equal
deleted
inserted
replaced
| 4148:de85ff0aaac5 | 4149:e59286f15189 |
|---|