aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-07 00:09:42 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-07 00:09:42 -0800
commitff32340669a5521ca2b4b547b4853bfe22f60386 (patch)
treebca331f6b19b2465ca5c71ab879ce03874f9be58 /Documentation
parent4c6e8aa8f001fa9619dc891c501d0d4389583353 (diff)
parent36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c (diff)
downloadgit-ff32340669a5521ca2b4b547b4853bfe22f60386.tar.gz
git-ff32340669a5521ca2b4b547b4853bfe22f60386.tar.xz
Merge branch 'js/maint-merge-recursive-r-d-conflict'
* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions