From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Wed, 18 May 2005 18:50:18 GMT
Subject: 'git resolve'
Message-ID: <20050518185018.GE4738@cip.informatik.uni-erlangen.de>

Hello,
has someone out there an git-resolve script? Which guides the user tot
he process of stuff that is not handeled the autmatic merge or the
threeway merge?

	Thomas