| commit | 2d7ce510f888e8d465497fade1733fbae71b6753 | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Fri, 24 Sep 2021 20:05:26 +0000 (24 20:05 +0000) | ||
| committer | Thomas Adam <thomas@xteddy.org> | |
| Fri, 24 Sep 2021 22:01:09 +0000 (24 23:01 +0100) | ||
| tree | 4ea14a2bf03697d0c64490c3297ef16208c63dc7 | treesnapshot (tar.gz zip) |
| parent | 10604dce6e625d11974fb5491598bbb54069e5d3 | commitdiff |
add a test for 'got merge' which covers a no-op merge situation
| regress/cmdline/merge.sh | diffblobblamehistory |