Mercurial > hg

diff tests/test-merge5.t @ 21172:0f0059af920c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve notes for listing the bids for ambiguous merges
author Mads Kiilerich <madski@unity3d.com>
date Mon, 21 Apr 2014 20:24:54 +0200
parents 41abe2e3e3b7
children fe80fdf68ba7
line wrap: on
line diff