diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-09 09:40:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 09:40:59 -0800 |
| commit | 6a96b32d3b045c6e8d1b553fd6b64e03db9b0e45 (patch) | |
| tree | 84cc69c74c96960d6315eadd0412daf18319d8dd /git-merge-ours.sh | |
| parent | 1c791cfbf843fee5c72b5b23c0c3ca8550e15c08 (diff) | |
| parent | 916d081bbaa40617643b09b6dc9c6760993cf6ed (diff) | |
| download | git-6a96b32d3b045c6e8d1b553fd6b64e03db9b0e45.tar.gz | |
Merge branch 'maint'
* maint:
Nicer error messages in case saving an object to db goes wrong
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions