| commit | eeba0d1760d6922e7d6ee838b8684e87a6c0c273 | |
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 1 Mar 2011 01:08:51 +0000 (28 18:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Mar 2011 19:52:59 +0000 (2 11:52 -0800) | ||
| tree | d545e76e239b17726b56a10dbc0a7bc52a3880f4 | treesnapshot (tar.gz zip) |
| parent | f59ba1cea02b3bed1025fd22f8601923fc81b6af | commitdiff |
t6022: New test checking for unnecessary updates of files in D/F conflicts
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6022-merge-rename.sh | diffblobblamehistory |