equal
deleted
inserted
replaced
147 ('', 'stat', None, _('output diffstat-style summary of changes')), |
147 ('', 'stat', None, _('output diffstat-style summary of changes')), |
148 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')), |
148 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')), |
149 ] |
149 ] |
150 |
150 |
151 mergetoolopts = [ |
151 mergetoolopts = [ |
152 ('t', 'tool', '', _('specify merge tool')), |
152 ('t', 'tool', '', _('specify merge tool'), _('TOOL')), |
153 ] |
153 ] |
154 |
154 |
155 similarityopts = [ |
155 similarityopts = [ |
156 ('s', 'similarity', '', |
156 ('s', 'similarity', '', |
157 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
157 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |