aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2004-08-21 19:47:50 +0000
committerJörg Mayer <jmayer@loplof.de>2004-08-21 19:47:50 +0000
commit96d7433ba74a64ae8c73635d9ff2d4fa40167381 (patch)
tree3444fc093d8947bf568acbada959a711d0ee51d2 /merge.c
parent7310caf56901aa26734a2abd18ae3a9bc91984ea (diff)
Missed the second case in last change
svn path=/trunk/; revision=11790
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions