diff options
| author | Carlos Martín Nieto <[email protected]> | 2014-10-15 15:59:08 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2014-10-15 15:59:08 +0200 |
| commit | a81abd10ca4786d5ad30aff8ac72f59896d12211 (patch) | |
| tree | 12c3fd087daba35a75ae1374f32ae9a905e51c1f /merge.go | |
| parent | 17a9214307250b5fd2769385c73b723d55a26dab (diff) | |
| parent | d917a13aca59722f5dca2c5c60eec0e243cbf01b (diff) | |
Merge branch 'fetchhead'
Conflicts:
remote.go
Diffstat (limited to 'merge.go')
0 files changed, 0 insertions, 0 deletions