Mercurial > jhg
comparison src/org/tmatesoft/hg/repo/HgIgnore.java @ 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 | 7f136a3fa671 |
children | e6407313bab7 |
comparison
equal
deleted
inserted
replaced
495:abfbe81154b5 | 496:c1c8f6859d3f |
---|