| commit | 88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Fri, 24 Sep 2021 20:47:39 +0000 (24 20:47 +0000) | ||
| committer | Thomas Adam <thomas@xteddy.org> | |
| Fri, 24 Sep 2021 22:01:09 +0000 (24 23:01 +0100) | ||
| tree | 1cee64078213fc6e41f187cc6d829968270d81fd | treesnapshot (tar.gz zip) |
| parent | dfe86d1fa6f81d3a709059eda591863efd8d5a34 | commitdiff |
stop caring about obstructed versioned files in 'got merge'
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.
| got/got.1 | diffblobblamehistory | |
| got/got.c | diffblobblamehistory | |
| regress/cmdline/merge.sh | diffblobblamehistory |