| commit | 044b9eca126235d9e300b9a7552df3d08de62d28 | |
| author | Andrew Borodin <aborodin@vmail.ru> | |
| Thu, 10 Jun 2010 07:23:30 +0000 (10 11:23 +0400) | ||
| committer | Andrew Borodin <aborodin@vmail.ru> | |
| Thu, 10 Jun 2010 07:23:30 +0000 (10 11:23 +0400) | ||
| tree | fa6b3660d6054bec759a2009d2ced80774ef5632 | treesnapshot (tar.gz zip) |
| parent | d90dede12fb4ddc07c462e43ccdf9c2ed7f7365e | commitdiff |
Fixed inaccuracy brach merging.
The e40a84f538b01515c216e8e43e91b8497a31f977 commit actually reverted
the 3209f8e61b393caec2c857b04f3bc5f1e4e4d326 one. That is wrong.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
The e40a84f538b01515c216e8e43e91b8497a31f977 commit actually reverted
the 3209f8e61b393caec2c857b04f3bc5f1e4e4d326 one. That is wrong.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
| src/editor/edit.c | diffblobblamehistory |