mercurial/mdiff.py
changeset 23293 b89856abf4e2
parent 21790 3fbef7ac26f0
child 23294 ec8c73b02e2e
equal deleted inserted replaced
23292:e44399c494ab 23293:b89856abf4e2
    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     git enables the git extended patch format
    27     nodates removes dates from diff headers
    27     nodates removes dates from diff headers
       
    28     nobinary ignores binary files
    28     ignorews ignores all whitespace changes in the diff
    29     ignorews ignores all whitespace changes in the diff
    29     ignorewsamount ignores changes in the amount of whitespace
    30     ignorewsamount ignores changes in the amount of whitespace
    30     ignoreblanklines ignores changes whose lines are all blank
    31     ignoreblanklines ignores changes whose lines are all blank
    31     upgrade generates git diffs to avoid data loss
    32     upgrade generates git diffs to avoid data loss
    32     '''
    33     '''