diff tests/test-merge-local @ 10908:816bac2f9452 stable

prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.
author Sune Foldager <cryo@cyanite.org>
date Wed, 14 Apr 2010 19:11:35 +0200
parents 46280c004f22
children 4c94b6d0fb1c
line wrap: on
line diff