comparison tests/test-push-warn.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 9344f5dd4488
children ced2d3620f95
comparison
equal deleted inserted replaced
1882:c0320567931f 1883:b98160cfb2f3