summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-27 22:36:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-27 22:36:19 (GMT)
commit9e76bab14e50c46c624ae35f13c527a7a1b1185d (patch)
tree499593788428c17315928abd9c9159517d4e995a /git-merge-octopus.sh
parent47979d5d5bb86d058dce77801648734abe1e593b (diff)
downloadgit-9e76bab14e50c46c624ae35f13c527a7a1b1185d.zip
git-9e76bab14e50c46c624ae35f13c527a7a1b1185d.tar.gz
git-9e76bab14e50c46c624ae35f13c527a7a1b1185d.tar.bz2
t4013 test updates for new output code.
These are updates to the test vector that shows the "incompatibility" of the new output code. The changes are actually the good ones, so instead of keeping the older output we adjust the test to the new code. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions