summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-27 14:57:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-27 14:57:37 -0800
commit103209c6782586d92b04ee1fc71c0fd6f6385f5f (patch)
tree6add5ef9c0464315cbfceb3e11beaf95caf731e3 /builtin-fmt-merge-msg.c
parentMerge branch 'il/maint-colon-address' (diff)
parentt0101: use a fixed timestamp when searching in the reflog (diff)
downloadtgif-103209c6782586d92b04ee1fc71c0fd6f6385f5f.tar.xz
Merge branch 'jc/maint-reflog-bad-timestamp'
* jc/maint-reflog-bad-timestamp: t0101: use a fixed timestamp when searching in the reflog Update @{bogus.timestamp} fix not to die() approxidate_careful() reports errorneous date string
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions