diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:51 -0700 |
| commit | 3bc484af74132332f5bb69401f223e2fe11bfa39 (patch) | |
| tree | c6a8b5fb8d699658e2ede9766493fc201f56f64e /git-merge-resolve.sh | |
| parent | Merge branch 'ds/commit-graph-fsck' (diff) | |
| parent | t5318: avoid unnecessary command substitutions (diff) | |
| download | tgif-3bc484af74132332f5bb69401f223e2fe11bfa39.tar.xz | |
Merge branch 'jt/commit-graph-per-object-store'
Test update.
* jt/commit-graph-per-object-store:
t5318: avoid unnecessary command substitutions
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions