Print conflict details with the new infrastructure (bug #11181)
[stgit] / contrib / .gitignore
CommitLineData
cceabd76 1*.elc