Mercurial Mercurial > mercurial / annotate
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-debugrename.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 4637 5a088ac232e6
child 10490 f2618cacb485
permissions -rw-r--r--
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
adding a
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
% test with --rev
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
mercurial