Mercurial > jhg
diff .hgignore @ 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 | b45e612ea750 |
children | edb2e2829352 7b883bf03b14 |