comparison .hgignore @ 231:1792b37650f2

Introduced access to conflict resolution information (merge state)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 01 Jun 2011 05:44:25 +0200
parents b45e612ea750
children edb2e2829352 7b883bf03b14
comparison
equal deleted inserted replaced
230:0dd9da7489dc 231:1792b37650f2