equal
deleted
inserted
replaced
1964 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1964 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1965 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
1965 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
1966 @@ -0,0 +1,1 @@ |
1966 @@ -0,0 +1,1 @@ |
1967 +b |
1967 +b |
1968 |
1968 |
|
1969 |
|
1970 Test that diff.merge is respected (file b was added on one side and |
|
1971 and therefore merged cleanly) |
|
1972 |
|
1973 $ hg log -pr 3 --config diff.merge=yes |
|
1974 changeset: 3:8e07aafe1edc |
|
1975 tag: tip |
|
1976 parent: 2:b09be438c43a |
|
1977 parent: 1:925d80f479bb |
|
1978 user: test |
|
1979 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1980 summary: 3 |
|
1981 |
|
1982 diff -r 8e07aafe1edc a |
|
1983 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1984 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1985 @@ -1,1 +1,1 @@ |
|
1986 -b |
|
1987 +c |
|
1988 |
1969 $ cd .. |
1989 $ cd .. |
1970 |
1990 |
1971 'hg log -r rev fn' when last(filelog(fn)) != rev |
1991 'hg log -r rev fn' when last(filelog(fn)) != rev |
1972 |
1992 |
1973 $ hg init simplelog |
1993 $ hg init simplelog |