summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-03 22:44:26 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-03 22:44:26 -0800
commit123ed6590836405acb4a0c38e2e4c1b06b4e49a9 (patch)
tree77c2d860a6df109f618064733e9340a4ef5af1f3 /builtin-merge.c
parentad685681c22c921e3b1c8ec9504289b5cd8e699b (diff)
parenta0fbc87cff6ae80c5b5be84201bc53252533b1fb (diff)
downloadgit-123ed6590836405acb4a0c38e2e4c1b06b4e49a9.tar.gz
Merge branch 'dm/svn-remote'
* dm/svn-remote: git-svn: Make branch use correct svn-remote
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions