summaryrefslogtreecommitdiff
path: root/epoch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-10 02:16:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-10 02:16:33 (GMT)
commitd5b0c9ea178dab3599674ccff50645c0464b8c31 (patch)
treea35b27b04d18022ea4731941ea2a1bedce998092 /epoch.c
parentf8e2c54c9a17af3319e96db1d9e97ace36ae6831 (diff)
parentfb8024b414b417d85ce215eba3dd23c188500c15 (diff)
downloadgit-d5b0c9ea178dab3599674ccff50645c0464b8c31.zip
git-d5b0c9ea178dab3599674ccff50645c0464b8c31.tar.gz
git-d5b0c9ea178dab3599674ccff50645c0464b8c31.tar.bz2
Merge branch 'fixes'
with minor hand resolving on git-tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'epoch.c')
0 files changed, 0 insertions, 0 deletions