| commit | 0a8de7ae3ed9cfd5d7fc94a077fa9574e71a1688 | [log] [tgz] |
|---|---|---|
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | Tue Jun 04 22:47:41 2013 +0400 |
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | Tue Jun 04 22:47:41 2013 +0400 |
| tree | f59a21727a2a2b809b753f6b8a4c07d5dc0f497a | |
| parent | b4ef6ec7985a3c98d916dbb376777912e50fd662 [diff] |
[HACK] lsk: tweak a solution to fix the ambiguous short SHA1 issue The solutions could not be reused due to the object index having become too short (some new tree object has the same 7-digit value). The current-conflict-$(whoami) started using 8-digit short index, and it no longer matches the saved conflict. Hand-edit the saved conflict file to make it use the 8-digit index. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>