From: Karl Hasselström <kha@treskal.com>
Date: Thu, 24 May 2007 16:40:38 GMT
Subject: StGIT and conflicts
Message-ID: <20070524164038.GA27661@diana.vm.bytemark.co.uk>

The current behavior of StGIT is to not use the index for conflicts
like git does. What advantages does this have that are great enough to
motivate a deviation from the git behavior?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle