Finalized raw changes for most recent version of the settings interface.

pjf / masterwork-dwarf-fortress

Patches and bugfixes applied to Meph's amazing Masterwork Dwarf Fortress

33 stars 22 forks source link

Finalized raw changes for most recent version of the settings interface. #46

Closed splintermind closed 10 years ago

splintermind commented 10 years ago

I'm not sure why it replaced some files entirely, maybe something (again) about whitespace changes due to the merge tool used? Maybe we should look into git config core.autocrlf?

pjf commented 10 years ago

Amusingly I only just saw this merge after I've done the merge. This is why I should check my notifications. :D

I'd not previously known about autocrlf. Thank you very much for teaching me something new!

Apparently there's an even more useful .gitattributes file which one can set. I'll look at adding one of these to the repo so we stop getting all the line changing madness.

~ pjf