From: Ævar Arnfjörð Bjarmason Date: Fri, 20 Aug 2010 21:03:01 GMT Subject: Re: t7610-mergetool.sh -q isn't quiet Message-ID: In-Reply-To: On Fri, Aug 20, 2010 at 06:50, Brian Gernhardt wrote: >    test "$(cat ../file1)" = "master updated" && >    test "$(cat ../file2)" = "master new" && That should also use test_cmp.