X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc.m4;h=febdc0b6d7d41bf8a8cc052cdd8a7cbc31050e1c;hb=d7057bf97274c3961a4e160177384ad2a227f893;hp=b3a6aa72478fa1514a5442ae558c7d3b9eda82ed;hpb=43b41a6e89f5458655517584ee019b48ada78dec;p=config%2Fdotfiles.git diff --git a/hgrc.m4 b/hgrc.m4 index b3a6aa7..febdc0b 100644 --- a/hgrc.m4 +++ b/hgrc.m4 @@ -21,7 +21,6 @@ include(../lib.m4) [ui] username = Simon Ruderich -ignore = HGIGNORE # Use Apple's FileMerge for merge conflicts. merge = opendiff-merge