Mercurial > hg
diff tests/test-issue2137.t @ 21269:fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Make recently introduced messages more useful. Instead of:
f1: g
f2: m
say:
f1: remote is newer -> g
f2: versions differ -> m
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 22 Apr 2014 02:09:24 +0200 |
parents | a421459b83c0 |
children | 2fc86d92c4a9 |