diff options
| author | Elijah Newren <newren@gmail.com> | 2011-02-28 18:08:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-02 11:52:59 -0800 |
| commit | eeba0d1760d6922e7d6ee838b8684e87a6c0c273 (patch) | |
| tree | d545e76e239b17726b56a10dbc0a7bc52a3880f4 /merge-recursive.c | |
| parent | f59ba1cea02b3bed1025fd22f8601923fc81b6af (diff) | |
| download | git-eeba0d1760d6922e7d6ee838b8684e87a6c0c273.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions