summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-27 10:54:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-27 10:54:30 -0800
commit6c647af3060b8dd20da0e0b21dcd0eb95ec70841 (patch)
treef09a042e242ac96c73c2645fc6e02c2bcf5bd1f3 /git-merge-octopus.sh
parentUpdate @{bogus.timestamp} fix not to die() (diff)
downloadtgif-6c647af3060b8dd20da0e0b21dcd0eb95ec70841.tar.xz
t0101: use a fixed timestamp when searching in the reflog
That will give us a better reproducibility during tests. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions