diff .hgignore @ 632:83692f82fbb7

Return a MergeResult
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 14 Aug 2013 11:07:19 +0400
parents a30befaa4349
children 0699b46a3d2a
line wrap: on
line diff