Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-excessive-merge.out @ 1883:b98160cfb2f3
give more info to hgmerge script.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 10 Mar 2006 23:34:02 -0800 |
parents | ef8cd889a78b |
children | 7544700fd931 |