Mercurial > hg4j
diff .hgignore @ 707:42b88709e41d
Merge: support 'unresolved' resolution with MergeStateBuilder
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 16 Aug 2013 19:22:59 +0200 |
| parents | 5b5d199e2eb3 |
| children |
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 16 Aug 2013 19:22:59 +0200 |
| parents | 5b5d199e2eb3 |
| children |