summaryrefslogtreecommitdiff
path: root/t/t6101-rev-parse-parents.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-02 01:46:22 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-02 01:46:22 -0700
commit1fd81efad0d65afba91f8fb27b40a6345bfb50de (patch)
treeb061c0e043619ba3469f23b7c73cbbc43cb62dc1 /t/t6101-rev-parse-parents.sh
parent7425dcc95e11c20dc4663d7a376dc9ba0424d843 (diff)
parent733a65aa5d33196fac708ebd12a98a1060cbf3c2 (diff)
downloadgit-1fd81efad0d65afba91f8fb27b40a6345bfb50de.tar.gz
Merge branch 'ew/svn'
* ew/svn: git-svn: allow dcommit to retain local merge information
Diffstat (limited to 't/t6101-rev-parse-parents.sh')
0 files changed, 0 insertions, 0 deletions