diff options
| author |  Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:47 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:33 -0700 |
| commit | 235e8d591480d7e1378c27fe65c5529625d4b5be (patch) | |
| tree | ecfd18463fa83687c6926852b373d8040d403234 /t/t6037-merge-ours-theirs.sh | |
| parent | comments: fix misuses of "nor" (diff) | |
| download | tgif-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.xz | |
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions