| commit | bc9560c0ccb51474b3e98ee069fdf38c40c9926e | |
| author | Marco Costalba <mcostalba@gmail.com> | |
| Thu, 27 Dec 2007 08:35:27 +0000 (27 09:35 +0100) | ||
| committer | Marco Costalba <mcostalba@gmail.com> | |
| Thu, 27 Dec 2007 13:21:30 +0000 (27 14:21 +0100) | ||
| tree | 5835b4d0fb6e4d7156d31eed2b4c7497ecb0e688 | treesnapshot (tar.gz zip) |
| parent | 7734525d2444e295fdc7ac675f44ac8b4cea43d0 | commitdiff |
Fix a bougus assert for unmerged files
When there are some unmerged files an (bogus) assert
is printout. Fix this.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
When there are some unmerged files an (bogus) assert
is printout. Fix this.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
| src/git_startup.cpp | diffblobblamehistory |