diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-09 20:10:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-09 20:10:12 -0400 |
| commit | 2ca723a7c1c1130465b21d7db23c137976f58f6f (patch) | |
| tree | 15c4e176efd734f26610b03e65eb37313050ca0c /debian | |
| parent | 35b79079e4cdd8534ae8d8868b46b3ad00a8ba64 (diff) | |
avoid fast-forwarding when a merge conflict was auto-resolved
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions