diff options
| author | Elijah Newren <newren@gmail.com> | 2018-06-30 21:11:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 14:43:42 -0700 |
| commit | d4d17180808437fd732a9d14388657b8f609ad4a (patch) | |
| tree | a1540ef0a6a092c6e763095a27da1ac39207e51e /git-gui/lib/win32_shortcut.js | |
| parent | 81f5a2ce7bd9a4a7114e420ef4544cf7ce29ad9b (diff) | |
t6036: add a failed conflict detection case with submodule modify/modify
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/win32_shortcut.js')
0 files changed, 0 insertions, 0 deletions