diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:30 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:30 (GMT) |
commit | d693345518e9d5145902ec001a364ccdec8e148b (patch) | |
tree | b978cd237fbabe3459ce986ecb2378dafe1259c1 /t/t6037-merge-ours-theirs.sh | |
parent | d8ce144e11fef0606a531a5a9c34c2a8ca09e155 (diff) | |
parent | bd482d6e3348fe369b3b1db2dadbca278a0f0025 (diff) | |
download | git-d693345518e9d5145902ec001a364ccdec8e148b.zip git-d693345518e9d5145902ec001a364ccdec8e148b.tar.gz git-d693345518e9d5145902ec001a364ccdec8e148b.tar.bz2 |
Merge branch 'dl/use-sq-from-test-lib'
Code cleanup.
* dl/use-sq-from-test-lib:
t: use common $SQ variable
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions