summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-23 15:01:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-23 15:01:03 -0700
commitf4d7b2e4d5daaa5f730a821173f4c453f08554e9 (patch)
treeb0d19feb357455954eb894a603e446344c078894 /resolve-undo.c
parentMerge branch 'jc/rerere-multi' (diff)
parenttravis-ci: enable Git SVN tests t91xx on Linux (diff)
downloadtgif-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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions