X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc.m4;h=febdc0b6d7d41bf8a8cc052cdd8a7cbc31050e1c;hb=e8cca40ee63015858022088d5e85d0199465eaab;hp=b3a6aa72478fa1514a5442ae558c7d3b9eda82ed;hpb=6185676752044be8c954377be9a8b982689b181e;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