tree a22c8dba2b3bccecffb20cabcdb4577ad73af503
parent 62345d54f3bed5bbdd26ec9d2d5275a450c533f8
author Vincent Driessen <vincent@datafox.nl> 1264757288 +0100
committer Vincent Driessen <vincent@datafox.nl> 1264765285 +0100

Support scenarios where the user might have cancelled a merge in the middle of a merge conflict.