Re: Expected Behavior?
From: Jon Loeliger <hidden>
Date: 2016-06-15 22:42:11
It appears that as the everyday workhorse, using Daniel's git-merge-resolve is stable through git-merge have proven stable enough. So here is a question. Do people mind if 'git-resolve' and 'git-octopus' are dropped before 1.0? This means 2 less programs in your /usr/bin ;-).
It's OK with me. :-) jdl