equal
deleted
inserted
replaced
1 #!/usr/bin/env python |
1 #!/usr/bin/env python |
2 |
2 |
3 from mercurial import demandimport |
3 from mercurial import demandimport |
4 demandimport.enable() |
4 demandimport.enable() |
5 |
5 |
6 import os, sys |
6 import sys |
7 from mercurial.i18n import _ |
7 from mercurial.i18n import _ |
8 from mercurial import simplemerge, fancyopts, util, ui |
8 from mercurial import simplemerge, fancyopts, util, ui |
9 |
9 |
10 options = [('L', 'label', [], _('labels to use on conflict markers')), |
10 options = [('L', 'label', [], _('labels to use on conflict markers')), |
11 ('a', 'text', None, _('treat all files as text')), |
11 ('a', 'text', None, _('treat all files as text')), |