Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-help.t
changeset 49172 5ad37b5bfb31
parent 49164 a932cad26d37
child 49183 22279b604a88
equal deleted inserted replaced
49171:2c0570a6d5ae 49172:5ad37b5bfb31 
   642       Differences between files are shown using the unified diff format.
 
   642       Differences between files are shown using the unified diff format.
 
   643   
   643   
   644       Note:
 
   644       Note:
 
   645          'hg diff' may generate unexpected results for merges, as it will
 
   645          'hg diff' may generate unexpected results for merges, as it will
 
   646          default to comparing against the working directory's first parent
 
   646          default to comparing against the working directory's first parent
 
   647          changeset if no revisions are specified.
 
   647          changeset if no revisions are specified.  To diff against the conflict
 
       
   648          regions, you can use '--config diff.merge=yes'.
 
   648   
   649   
   649       By default, the working directory files are compared to its first parent.
 
   650       By default, the working directory files are compared to its first parent.
 
   650       To see the differences from another revision, use --from. To see the
 
   651       To see the differences from another revision, use --from. To see the
 
   651       difference to another revision, use --to. For example, 'hg diff --from .^'
 
   652       difference to another revision, use --to. For example, 'hg diff --from .^'
 
   652       will show the differences from the working copy's grandparent to the
 
   653       will show the differences from the working copy's grandparent to the
mercurial