Nouveautés

[exae]

Malheureusement je vois que l'indentation n'est plus la même du coup tout est différent...
Si mes modifs intéressent quelqu'un, bon courage.

[BaesFr]

Peut être un merge manuel ?

vu sur http://git-scm.com/docs/git-merge#_fast_forward_merge

ignore-space-change
ignore-all-space
ignore-space-at-eol
Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also git-diff[1] -b,-w, and --ignore-space-at-eol.

If their version only introduces whitespace changes to a line, our version is used;

If our version introduces whitespace changes but their version includes a substantial change, theirversion is used;

Otherwise, the merge proceeds in the usual way.

[gborri]

please merge this pull request. I would like to use flicker as a backup, but if set are not managed, if i loose my picture, re-organizing from flat is a crazy work.