merge-recursive: handle D/F conflict case more carefully.
[git] / contrib / emacs / .gitignore
1 *.elc