diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-07-21 15:57:23 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-07-21 15:57:23 +1000 |
commit | e059a87ae2c3bb4abce9c261db04971915520479 (patch) | |
tree | 3e5d9e18295a3ac7141c8d67bf838f33890a2644 /test | |
parent | 087cc7362aea3aa7f147844151225dac3ac1a9d8 (diff) |
refreshing files if there's an error while pulling because chances are it's a merge conflict
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions