Update the tutorial for the conflict situations
[stgit] / contrib / .gitignore
1 *.elc