My vote goes to mercurial. I too use git at work, and didn't find learning mercurial and patchbomb disruptive. It suits the Chirp development process well.

Tom KD7LXL