diff options
| author |  Ori Avtalion <ori@avtalion.name> | 2016-03-29 21:59:45 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-29 13:14:50 -0700 |
| commit | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (patch) | |
| tree | f01ef44625d104c2e8d6507c5f8e5f60f2339352 /t/t5515-fetch-merge-logic.sh | |
| parent | Git 2.6.6 (diff) | |
| download | tgif-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.tar.xz | |
Documentation: git diff --check detects conflict markers
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions