diff options
| author | Jinoh Kang <luke1337@theori.io> | 2020-11-06 17:14:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 19:20:39 (GMT) |
| commit | d66851806ff25c6afdb4650d8292a50d5ca0ea6d (patch) | |
| tree | 45769e30dfdf55a9e0c3be38909f0df38ede4594 /t/t5536-fetch-conflicts.sh | |
| parent | 246959346f3407cb047c3d46ed9c44da84bd0b29 (diff) | |
| download | git-d66851806ff25c6afdb4650d8292a50d5ca0ea6d.zip git-d66851806ff25c6afdb4650d8292a50d5ca0ea6d.tar.gz git-d66851806ff25c6afdb4650d8292a50d5ca0ea6d.tar.bz2 | |
t7800: simplify difftool test
The new test added by the previous commit can be simplified a lot.
Let's do so.
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jinoh Kang <luke1337@theori.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions