hg.rst
changeset 1647 107b566e7a12
parent 1646 fdd6045a5563
child 1659 7dc153b728f7
equal deleted inserted replaced
1646:fdd6045a5563 1647:107b566e7a12
    70   hgext.convert =
    70   hgext.convert =
    71   ; Usage:  hg glog <dir>
    71   ; Usage:  hg glog <dir>
    72   hgext.graphlog =
    72   hgext.graphlog =
    73   ; Enable '.hgeol' tracking (fix for CR/LF).
    73   ; Enable '.hgeol' tracking (fix for CR/LF).
    74   hgext.eol =
    74   hgext.eol =
       
    75 
       
    76 Show diff against 2 parents or base during merge.
       
    77 =================================================
       
    78 ::
       
    79 
       
    80   hg diff -r 'p1()'
       
    81   hg diff -r 'p2()'
       
    82   hg diff -r 'ancestor(p1(), p2())'
    75 
    83 
    76 Downgrade repository format.
    84 Downgrade repository format.
    77 ============================
    85 ============================
    78 
    86 
    79 To get list of supported repo formats type::
    87 To get list of supported repo formats type::