# HG changeset patch # User padraigob@netbeans.org # Date 1203331734 0 # Node ID 5b028cd0adccd9d366e4fa09b950f799cf722d1a # Parent 9ba828f73a1623020ec5eea72f462f9e6b68fe52 127561: Make color of LocallyDeleted file consistent with CVS and Subversion diff -r 9ba828f73a16 -r 5b028cd0adcc mercurial/src/org/netbeans/modules/mercurial/Bundle.properties --- a/mercurial/src/org/netbeans/modules/mercurial/Bundle.properties Fri Feb 15 11:44:33 2008 +0000 +++ b/mercurial/src/org/netbeans/modules/mercurial/Bundle.properties Mon Feb 18 10:48:54 2008 +0000 @@ -60,8 +60,8 @@ modifiedLocallyFormat = {0}{1} #999999 grey -deletedLocallyFormat = {0}{1} -#C2DFFF slate grey +deletedLocallyFormat = {0}{1} +#999999 grey conflictFormat = {0}{1} #FF0000 red