diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-25 15:11:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-25 15:22:16 -0400 |
| commit | f9a9ee1f739843b0b7c12a620d7adb55939bacbc (patch) | |
| tree | a2c49c8746dd5d041ef6423de3ea37e063693f7b /Remote/Git.hs | |
| parent | 65962bdc503a084bf17a488e1a5e03c41fb29b2a (diff) | |
make direct mode merge cleanup more robust
If the cleanup of a single file fails for some reason, continue
to clean up other files.
This could happen because of a race. The merge pulls in a change to a file,
which gets changed locally at the same time.
Diffstat (limited to 'Remote/Git.hs')
0 files changed, 0 insertions, 0 deletions