Mercurial > hg4j
diff .hgtags @ 496:c1c8f6859d3f
Recognize 'merged from parent' metastate in dirstate
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Mon, 22 Oct 2012 20:33:20 +0200 |
| parents | e04e7ecc4882 |
| children | 9c5af6ed57c3 |
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Mon, 22 Oct 2012 20:33:20 +0200 |
| parents | e04e7ecc4882 |
| children | 9c5af6ed57c3 |