diff options
| author | Malf Furious <m@lfurio.us> | 2017-09-06 03:36:28 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2017-09-06 03:36:28 -0400 |
| commit | 6a47d2874328c4ec70dc36a572c31d20b3aab0b3 (patch) | |
| tree | c3b6845c0e185f5718b6875a4405bce78248cc84 /.gitignore | |
| parent | 0ece6f93e353704dbcead707972e44460dec32b2 (diff) | |
| download | systrunk-6a47d2874328c4ec70dc36a572c31d20b3aab0b3.tar.gz systrunk-6a47d2874328c4ec70dc36a572c31d20b3aab0b3.zip | |
Move merge pointer cleanup into systr_merge_finish
This is to not break things if the user leaves interactive resolution and
has to use systrunk apply-merge.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions