summaryrefslogtreecommitdiff
path: root/t/t6042-merge-rename-corner-cases.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-05-08 04:55:35 -0400
committerLibravatar Jeff King <peff@peff.net>2012-05-08 04:55:35 -0400
commit5410ae422b0f3cfe604d393addcd13526e940112 (patch)
treee8273858fa5355dfefb5212eebd3289cfcf46c7d /t/t6042-merge-rename-corner-cases.sh
parentThe ninth batch of topics graduated to 'master' (diff)
parentstatus: respect "-b" for porcelain format (diff)
downloadtgif-5410ae422b0f3cfe604d393addcd13526e940112.tar.xz
Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
* jk/maint-status-porcelain-z-b: status: respect "-b" for porcelain format status: fix null termination with "-b" status: refactor null_termination option commit: refactor option parsing Conflicts: wt-status.h
Diffstat (limited to 't/t6042-merge-rename-corner-cases.sh')
0 files changed, 0 insertions, 0 deletions