mattanja

using log4net.Appender;
using log4net.Core;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;

namespace XXX.Framework.Logging
{
    /// <summary>
    /// Simple appender, writing all logging events to the given <c>TestContext</c>.
    /// </summary>

orj

[merge]
        keepBackup = false
        tool = custom
        
[mergetool "custom"]
        cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
        keepTemporaries = false
        trustExitCode = false
        keepBackup = false