From: Richard Hartmann Date: Sat, 25 Oct 2014 05:57:56 +0000 (+0200) Subject: Merge branch 'feature/status_against_remote_tracking' X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e4bc54441966a1c4225d666a1de5e6df47410336?hp=e4bc54441966a1c4225d666a1de5e6df47410336 Merge branch 'feature/status_against_remote_tracking' Conflicts: vcsh ---