Mercurial > jhg
comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 282:e51dd9a14b6f
Yet another WC status fix, where dirstate parent and base revision are treated right (dirstate parent other than tip and explicit baseRevision are not the same)
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Sat, 03 Sep 2011 01:21:03 +0200 |
parents | c6450b0b1fd5 |
children | 7232b94f2ae3 |
comparison
equal
deleted
inserted
replaced
281:81e9a3c9bafe | 282:e51dd9a14b6f |
---|