comparison tests/histedit-helpers.sh @ 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 35729bdd59b6
children 890273343170
comparison
equal deleted inserted replaced
21268:a0b8a912ec81 21269:fa601c4e03f9