diff admin/notes/trailing-whitespace @ 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 695cf19ef79e
children 375f2633d815 ef719132ddfa
line wrap: on
line diff