I personally always use one-per-line as well, as that results in better readable diffs, having said that, I don't care enough about it to change it :)