| commit | 73ea229668910319e8ac5902ef02e92f3a7aae7d | [log] [tgz] |
|---|---|---|
| author | micky387 <mickaelsaibi@free.fr> | Sat Dec 07 21:59:34 2024 -0500 |
| committer | micky387 <mickaelsaibi@free.fr> | Mon Dec 09 13:19:12 2024 -0500 |
| tree | 0f5642001930f90244b47138dc2042f9d9f1def1 | |
| parent | 631f3727b6cdca81600ac65ba689c8c5c0778b45 [diff] |
omni: Fix the echo merge conflicts * Drop the deprecated --force-broken option. It's true by default * Use porcelain option to grep if there's an merge conflict https://git-scm.com/docs/git-status/2.0.5 * Only abandon merge if one merge conflict is in progress. Change-Id: I610d423ad17442f1b1eea3c83a4a18dfe523c7ad