summaryrefslogtreecommitdiff
path: root/Documentation/docbook-xsl.css
diff options
context:
space:
mode:
authorLibravatar Schalk, Ken <ken.schalk@intel.com>2010-09-20 02:28:34 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 17:32:35 -0700
commit8a1c0d322e9b6963f3be6949475983d517d79796 (patch)
treeea2458b73a7bc6097742f6ae53c6b7b924b317c6 /Documentation/docbook-xsl.css
parentMerge branch 'en/rename-d-f' into en/merge-recursive (diff)
downloadtgif-8a1c0d322e9b6963f3be6949475983d517d79796.tar.xz
t3030: Add a testcase for resolvable rename/add conflict with symlinks
d5af510 (RE: [PATCH] Avoid rename/add conflict when contents are identical 2010-09-01) avoided erroring out in a rename/add conflict when the contents were identical. A simpler fix could have handled that particular testcase, but it would not correctly handle the case where a symlink is involved. Add another testcase using symlinks, to avoid breaking that case. Signed-off-by: Ken Schalk <ken.schalk@intel.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/docbook-xsl.css')
0 files changed, 0 insertions, 0 deletions