Mercurial > hg > gitweb

comparison tests/test-merge-local @ 4365:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents ad6f34c83c3d
children
comparison
equal deleted inserted replaced
4364:d5c3a70f8422 4365:46280c004f22
36 hg co 0 36 hg co 0
37 hg diff --nodates | grep "^[+-][^<>]" 37 hg diff --nodates | grep "^[+-][^<>]"
38 hg st 38 hg st
39 39
40 echo "# local merge with conflicts" 40 echo "# local merge with conflicts"
41 HGMERGE=merge hg co 41 hg co
42 hg co 0 42 hg co 0
43 hg diff --nodates | grep "^[+-][^<>]" 43 hg diff --nodates | grep "^[+-][^<>]"
44 hg st 44 hg st
45 45
46 echo "# local merge without conflicts" 46 echo "# local merge without conflicts"
47 hg revert zzz2_merge_bad 47 hg revert zzz2_merge_bad
48 HGMERGE=merge hg co 48 hg co
49 hg diff --nodates | grep "^[+-][^<>]" 49 hg diff --nodates | grep "^[+-][^<>]"
50 hg st 50 hg st