Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/mdiff.py @ 2892:8b02af865990
Add diff --git option
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 14 Aug 2006 22:48:03 -0700 |
parents | 4ec58b157265 |
children | d838bfac668d |
comparison
equal
deleted
inserted
replaced
2891:453097750fbf | 2892:8b02af865990 |
---|---|
21 | 21 |
22 class diffopts(object): | 22 class diffopts(object): |
23 '''context is the number of context lines | 23 '''context is the number of context lines |
24 text treats all files as text | 24 text treats all files as text |
25 showfunc enables diff -p output | 25 showfunc enables diff -p output |
26 git enables the git extended patch format | |
26 ignorews ignores all whitespace changes in the diff | 27 ignorews ignores all whitespace changes in the diff |
27 ignorewsamount ignores changes in the amount of whitespace | 28 ignorewsamount ignores changes in the amount of whitespace |
28 ignoreblanklines ignores changes whose lines are all blank''' | 29 ignoreblanklines ignores changes whose lines are all blank''' |
29 | 30 |
30 defaults = { | 31 defaults = { |
31 'context': 3, | 32 'context': 3, |
32 'text': False, | 33 'text': False, |
33 'showfunc': True, | 34 'showfunc': True, |
35 'git': False, | |
34 'ignorews': False, | 36 'ignorews': False, |
35 'ignorewsamount': False, | 37 'ignorewsamount': False, |
36 'ignoreblanklines': False, | 38 'ignoreblanklines': False, |
37 } | 39 } |
38 | 40 |