|
|
|
|
|
|
by rcthompson
5312 days ago
|
|
|
Interesting. I'll have to try it out again. Although, if I'm reading this correctly, the logic isn't quite right. It uses the timestamp of the time when the conflict is detected, when it should really use the conflicted file's last-modified time, or maybe the timestamp of the conflicting commit. |
|
|