Mercurial > hg4j
diff .hgtags @ 341:75c452fdd76a
Merging state not detected when there's no conflicts to resolve (no merge/state file)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Thu, 17 Nov 2011 07:04:58 +0100 | 
| parents | 8f872bd7ddd2 | 
| children | 1d9bcab9c50f | 
