diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-25 18:14:01 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-25 19:03:37 +0100 |
| commit | 6a85de8f3b427431d76db41e4e6925467fe1d868 (patch) | |
| tree | 7b5f92cc614c53f1d29752e8f3d46e5a0dd9c700 /tests.branching | |
| parent | 1778d046868c72b20db4bfb2b31b7f671ca7693b (diff) | |
| download | morph-6a85de8f3b427431d76db41e4e6925467fe1d868.tar.gz | |
morph merge: Clean up on failure
Run git reset --hard in all repos if we get an exception at any point.
merge_system() is extracted out of merge() to avoid comedy indentation.
Diffstat (limited to 'tests.branching')
0 files changed, 0 insertions, 0 deletions