From: Chris Leong <walkraft@gmail.com>
Date: Wed, 15 Feb 2012 03:12:57 GMT
Subject: (unknown)
Message-ID: <CAJ6vYjcefsPUfibnySpwFk2bGTC1mpBWF6Tjv5AgyyZcn0-d3A@mail.gmail.com>

Apparently setting merge.conflictstyle to diff3 will display the base
when diffing an incomplete merge, instead of just ours and theirs.

Is there a way to run this command without setting the config, so that
I can switch between normal diffs and diff3s easily?