| commit | f6f152fff842e68f724437314dbe40778acfb949 | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@datafox.nl> | 周五 1月 29 10:28:08 2010 +0100 |
| committer | Vincent Driessen <vincent@datafox.nl> | 周五 1月 29 12:41:25 2010 +0100 |
| tree | a22c8dba2b3bccecffb20cabcdb4577ad73af503 | |
| parent | 62345d54f3bed5bbdd26ec9d2d5275a450c533f8 [diff] |
Support scenarios where the user might have cancelled a merge in the middle of a merge conflict.