diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-21 20:14:34 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-21 20:14:34 +0200 |
| commit | 0e5a9e753e30be4aff2e6b4df00d402c49ba4507 (patch) | |
| tree | 1d7c00e87088b123ad36608ebd4d6d27d1dbdc42 /git/stash.sh | |
| parent | 8c7b95b021bd6f4509a03ac22240788f85c0e4b0 (diff) | |
Merge failures into non-master branches are ok (conflicts)
Diffstat (limited to 'git/stash.sh')
0 files changed, 0 insertions, 0 deletions