diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-23 15:01:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 15:01:03 -0700 |
| commit | f4d7b2e4d5daaa5f730a821173f4c453f08554e9 (patch) | |
| tree | b0d19feb357455954eb894a603e446344c078894 /builtin/merge-ours.c | |
| parent | Merge branch 'jc/rerere-multi' (diff) | |
| parent | travis-ci: enable Git SVN tests t91xx on Linux (diff) | |
| download | tgif-f4d7b2e4d5daaa5f730a821173f4c453f08554e9.tar.xz | |
Merge branch 'svn-travis' of git://bogomips.org/git-svn
* 'svn-travis' of git://bogomips.org/git-svn:
travis-ci: enable Git SVN tests t91xx on Linux
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions