diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-03 14:32:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-03 14:32:07 -0400 |
| commit | c2c49d4c5ef1257b9163c21526d5111e2469c4d1 (patch) | |
| tree | 3c648fb8a89be884fc34c5c197375787361652cd /.mailmap | |
| parent | bed679954ca3c6a4a456a8b1ce499447e5c71593 (diff) | |
fix broken test
f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d broke the mixed conflict
resolution test. Since origin is no longer involved, both sides have to
sync after pairing. (The sync before pairing is just to get a commit.)
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions