diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-15 12:54:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-15 15:23:32 -0700 |
commit | abb25ac365791e16563dfd09e4ecd3e7e4dcf6b1 (patch) | |
tree | 1eb3704391b1a89a93dc1db9f06d125e1ab98b53 /git-mergetool.sh | |
parent | fea33a1ef37a5891ebd1fcf6018849150e7b91cb (diff) | |
download | git-abb25ac365791e16563dfd09e4ecd3e7e4dcf6b1.tar.gz |
t6050: make sure we test not just commit replacement
The replacement mechanism should affect all types of objects not
just commits, so make sure it deals with at least a blob.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions