Set dummy merge driver merge ours .gitattributes.
[fr] Update chapter on diffing
[fr] sync with 90c92ceb
[fr] sync with 21e84add
[fr] sync with 2a0a8371
[fr] apply 15f2bf1b
[fr] apply bdef6f76 and 1ca5ef16
fix  chap 4.
Introducing PR#750
Translating Limiting Log Output according to Date/Time
Adding empty row

To stay consistent
[it] Updating chapter 6
[it] Updating chapter 1
Merge pull request #795 from daftano/it

[it] Updating chapter 6
Merge pull request #793 from daftano/master

[it] update chapter 2
Merge pull request #794 from daftano/en

Adding empty row
Add a chmod on the ~/.ssh on server

As remarked in #709, setting up a key-based server may need to set up
restricted rights.
[de] Add missing word and comma
Merge pull request #797 from kensanata/german-typos

[de] Add missing word and comma
Clarify usage of single quotes, not simple

' is more commonly known as a single quote.

Was pointed out in #792 by @harupong