| commit | 638df2539e82ce1ea561b40ba979d5c8604c05d2 | [log] [tgz] |
|---|---|---|
| author | Nick Coghlan <ncoghlan@gmail.com> | Sun Sep 30 13:25:23 2012 +0530 |
| committer | Nick Coghlan <ncoghlan@gmail.com> | Sun Sep 30 13:25:23 2012 +0530 |
| tree | f62d0e3463c14bce8e13dd1d55ffcff66c84a93a | |
| parent | 81b409c618691d69c16f5cbef29f924d312e4863 [diff] | |
| parent | 349c802fd885e744b2a803bd41e8d234cc1688e9 [diff] |
Merge commit, because Mercurial's handling of push races is bloody awful