diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-14 00:57:31 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:43 +0300 |
| commit | ff15fbf10c8c32fde876e5c9578fdc2161b7905c (patch) | |
| tree | 769084325b3bc046062dff48ffa2ac608cf436a8 /spec/lib/gitlab/conflict | |
| parent | f3743111a7c5470171a2ca224e28b838c5bd17e7 (diff) | |
| download | gitlab-ce-ff15fbf10c8c32fde876e5c9578fdc2161b7905c.tar.gz | |
Implement conflict selection with highlighting.
Diffstat (limited to 'spec/lib/gitlab/conflict')
0 files changed, 0 insertions, 0 deletions