diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2016-02-16 11:34:36 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2016-02-16 11:34:36 -0800 |
| commit | c184c1a81a16a3f043c56837465d9972e6f8d73e (patch) | |
| tree | 557130da42b010202a432326cd41e6e0cf767ebc /tests | |
| parent | 31a617408fb42b0d595088ac10458a3a4922543d (diff) | |
Correctly handle --merge in the history.fish function
Previously --merge happened to work, but only because it was
smuggled in through the 'print' command
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions