comparison src/atimer.c @ 107068:8d8e02bbef81

(vc-bzr-dir-extra-headers): Add a header when a pending merge is detected.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 31 Jan 2010 20:58:35 -0800
parents 1d1d5d9bd884
children c3852852bbc0 d3f1a0178876
comparison
equal deleted inserted replaced
107067:5f67deabc08b 107068:8d8e02bbef81