Add conflict detection/resolution to vc-hg (bug#10709)
[bpt/emacs.git] / msdos / emacs.pif
CommitLineData
a4a9692d 1