| commit | 461f6aedbd48fa1a352a579c70013ff02d50a6c5 | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Mon, 11 Oct 2021 18:25:11 +0000 (11 18:25 +0000) | ||
| committer | Thomas Adam <thomas@xteddy.org> | |
| Tue, 12 Oct 2021 20:02:46 +0000 (12 21:02 +0100) | ||
| tree | 914c78857a97767e9edb837bcd0c0f9c12ad6bde | treesnapshot (tar.gz zip) |
| parent | fd3a2fe6d4ac59847dc2b41f799aff0170600728 | commitdiff |
fix merging of files which contain a dot on a line by itself
Annoying bug which we inherited from OpenRCS which inherited
it from OpenBSD's diff3 program.
ok tracey millert
Annoying bug which we inherited from OpenRCS which inherited
it from OpenBSD's diff3 program.
ok tracey millert
| lib/diff3.c | diffblobblamehistory | |
| regress/cmdline/cherrypick.sh | diffblobblamehistory |